Menu Class name changes and updated comments