Revamp named validations
Make it clear that we're dealing with classes