Fixed constant names