Names with spaces fix