Fixed some constant names