Fixing old class name still remaining