Updated constant naming conventions to be more clear