Fix import namings