FIX: import error after recent renaming