CSPACE-6337: Renaming variables for clarity and consistency.