cover a broader range of regex name forms