updated regexes to better match some edge cases regarding names of object-groups