is a specific kind of: distemper, ill humor, ill humour.

is a broader term that covers: testiness, tetchiness, touchiness | pet.

derivation: fretful, querulous, whiney, whiny | bad-tempered, crabbed, crabby, cross, fussy, grouchy, grumpy, ill-tempered | cranky, fractious, irritable, nettlesome, peckish, peevish, pettish, petulant, scratchy, techy, testy, tetchy.