Mostly renaming for clarification