Change constants and variable names to be more descriptive