Support for names with withespace