Shallow refactor / renaming