Fixed class names to conform to Composer conventions