change regex names to better reflect what the actually match on