My suggestion several posts back seems to have been ignored, so on the off chance it wasn't understood, I'll try to be clearer. Rather than needing to choose between one name or the other, the names can be combined in the manner of a bang potion or Hidden City Sphere. They can be named like this:
glassy bottle of Merlot
great bottle of Port
bad bottle of Pinot Noir
average bottle of Zinfandel
vinegary bottle of Marsala
spooky bottle of Muscat
If those designation are used on the basement map and anywhere that the bottles used to be named (like in inventory and item drops at the end of combat), then nobody will be troubled.