Menu Code changes.

Renamed Menu Classes in preparation for more advanced re-factoring.