Updated regex to handle some cases better

i.e. HTTPContext parses into "HTTP" and "Context"