Handle spaces and name conflicts.