Change class name according to our common naming scheme and remove unnecessary 'using' directive. Ref #1467