Adjust classname to match capitalization

Change-Id: Iee180a9ca1651aa5a08f451b822a0ef32bada2de
Merge "Adjust classname to match capitalization"