slot naming refactoring