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