modifying string constants for standard naming convention