Fix import names with spaces