Renames and refactor