change naming conventions for validators