Although I've learned it both ways, I tend to use pop.
As a bartender, I learned what some of the proper terms are:
Soda generally means soda water (carbonated water).
Cola is generic for Coke/Pepsi, etc.
When somebody asks for coke you ask if it is specifically coke, or if they were using it generically
Oh well, that's all part of our "pop" culture.