Minor name refactoring