Change class names to use with composer