Moved UserTypes to DRCTypes.h. Cleaned up naming conventions and code that uses types.