Fixed problem with two-word names