Handle spaces specially
Add name seperator correctly