Some refactoring and renaming