Changed constant names