Renaming variables for consistency