Rename to use ClassName convetion and add some small sugar