refactoring static final variable names to meet standard naming convention