Fix for dumping the class name in the summary
Just renamed some of the functions to make them less confusing