Renaming

Does not include the service context refactor. I will make a new PR for that