Fixing imports and names