Support for names with withspace