Fixing imports after name change