Fixed PSR standards - removed underscore from constants names