refactoring relation naming