fixed constant names