naming updates and refactor