improved class constant names