Change class names before altering to use node
fix problem after merge