cleaned up naming, and fixed an issue related to using strings instead of regular expressions