fix imports and name reuse