Unannounced Base-Class rename fix.