renamed PrimitiveClassForPrimitive() to PrimitiveClass() and PrimitiveClassName() to PrimitiveName()