improved constant names