aonuisync: fix imports to be idiomatic