Some renaming to clarify intent