Updated names of classes and templates.
Added more clarity.