Conformed code to existing constant conventions