Some refactoring/renaming