in this case, just rename the baseclass so that it matches the
other places we do this

Change-Id: I21704db7352f72e43636dde9e92c8bef61b7e251