rename to use consistent camal case for class names