Clean-up Custom types regular expression definitions, example REGEX vs REGEXP, _TYPE vs no _TYPE, etc.

[geetanjalimanegslab]

Need to clean-up these custom types regular expression definitions, they lack consistency (REGEX vs REGEXP, _TYPE vs no _TYPE, etc.