Renamme and refactor