I think you made an important point here. There certainly is a distinction between being self-employed and being an entrepreneur, but a lot of people still use the terms interchangeably. Personally, I'm working towards being an entrepreneur because of the whole job mentality aspect that you referred to.