Renaming to clarify use