Changed the constant names