To make class name consistent with file name Change-Id: If4d0f0a24d2534c9b73cc6cbb0ee14ab8c124ed9
Collaboratively Change-Id: I6c5417a0681f9bb8596c36600a569df2ddd7bf9e