Renamed constants in preparation for the big cache cleanup