Fix: Last fixes for OpenStack API imports after renaming