The main difference is who owns the means of production. In communism, the government does. In socialism, the people do.

What would we call a hybrid system in which the government is made up of the people and owns the means of production? Democratic Communism?