Minnor naming refactoring