Refactor Rename fixes