Rename regex variables

Per @andytuba's comments on #866.