name convenction refactor