Fixed import/naming errors