Rename feature and more refactoring.