-changed how the classname is produced - to support multiple words in the name