Rename class and jar

Change-Id: I62de7eb99d0ecb9cf54a09e9f61f9479c7be4434
6 files changed