Rename class name correctly
Implementing...