Updating project to use new version macro names.
Adding regex to header file.