Renaming for consistency/correctness