Proper rename overrides more declarative.