definition names refactor