Fix names in naming conventions rule(joke's on me), fix regexes