refactor consistent naming