Renamed the controller back to original; updated mapping.
Changed the order of mapping entries.