More fixing of imports and using module names.