renaming class, moving datatype constants back into it for autoloader compatibility