Recapatialize some renamed classes