update class names to match interfaces