Minor refactoring/renaming