Added support for "unclean" names.