concepts naming refactor