Changed the name of the value handler classes.