Simplified controller names
New flight control module