Why would we put things back the way they were? The way it was led us to this.

But sure, we can fix the stupid renaming nonsense.