Generally investor mean someone who are gaining profit from the increasing price of an asset, the same applied to Bitcoin, if a person is buying Bitcoin solely to gain some profite when the price of Bitcoin goes up, then he/she is investor. For your first case, people who has Bitcoin on their wallet and spend it for something or using it for a transaction, I think the correct term is Bitcoin Adopter, because they adopt Bitcoin as their currency for transaction.