Use classname for name information in oc table
Merge branch 'master' into feature-Small