Resolved #5 Applied naming convention to constants