Renaming for consistency/clarity