Destutter labels and files

This brings the code base closer to idiomatic function/type and file naming.

A number of function names have been left for later since there is significant documentation value in their current names that mean changes should wait until doc comments have been added.