Fix constant names