Bug77235 Fix for CF name with spaces