additional usage type ids
cleanups
axis labels in CamelCase