! minor refactoring on names