Weight classname cleanup