VID-357 re-organizing tracking constants