Add regular expression class renaming. Closes #8