fixes #6267 - singularize of HostClass and HostgroupClass is wrong