tomtom:
Don't get caught up in the semantics of product naming. Be aware that no one has to label their compounding products in any particular way and different manufacturers have different conventions.
It sounds like you have some defects that you'd like to correct. Instead of standing in front of a shelf at a store looking for key words like "polish" and "swirl remover", I'd spend some time hanging around a detailing forum and find a couple of specific product recommendations (like 2ndname had above) for your issues. Note that detailing forums (like autotopia and autogeek) are more hard core than subforums (like this one) and usually have a broader range of experience. Of course, lots of people hang around in both
