Improve case consistency on various definitions.