I made similar changes for all constants