Added TYPE_ prefix to commodity type constants