Hygiene: Avoid camel case complaints

Change-Id: Iecb253d8ea01f36015b6386afe825066790cd992