Move to less confusing class name

Change-Id: I7771bfd88e4a2bba0cd89abb8660d5640ecd4099