Names/layout refactoring