Renames class to be more intuitive.
Fix class style error.