Change the way current is labeled so that non-standard labeling becomes standard labeling.

THe current form of standard labeling is wrong. Non-standard labeling is the right way to do everything.