I12: Old model classes removed and renamed