Refactored constants’ names to conform to best practices