Renaming for clarity