Rename Regexp to Regex as per upstream changes