Handle short names with spaces