changed constant names