Minor fixes from class name change