Do a better job of naming the constants

There were some file situations that generated duplicates.