Minor edits to variables for standardization