ideally camel case the rest of these for consistency

Change-Id: I7f66b8051ea58963ea28d128f73900aefe5d2846