That statement by Marx is an ideal. No country's populace has ever controlled the means of production.

Yes to both. Countries calling themselves communist aspire to communism. Not even they claim to be fully communist; if I remember correctly, they call it 'actually existing socialism', which acknowledges that most industry is controlled by the state, rather than workers. They say they will return control to the workers once the conditions are ripe, but so far this has happened only in a handful of sectors. Very few people willingly give up power.

And I wouldn't conflate them because most socialists would be pretty offended to be identified as communist. The average socialist likes Denmark and Sweden. Not Cuba or something.

Communists are a subset of socialists. Technically you might be wrong, because the Chinese communist party probably has more members than all other socialist parties in the world put together, but I get what you are saying.