Modified the variable names from settings to uppercase