diff --git a/adm/upgrade.dat b/adm/upgrade.dat
index 65bdbb16f0..1abd84f607 100644
--- a/adm/upgrade.dat
+++ b/adm/upgrade.dat
@@ -1,4 +1,5 @@
 [rename]
+Adaptor3d_OffsetCurve Adaptor2d_OffsetCurve
 BRepExtrema_OverlappedSubShapes BRepExtrema_MapOfIntegerPackedMapOfInteger
 ShapeConstruct_CompBezierCurves2dToBSplineCurve2d Convert_CompBezierCurves2dToBSplineCurve2d
 ShapeConstruct_CompBezierCurves2dToBSplineCurve Convert_CompBezierCurves2dToBSplineCurve
@@ -14,6 +15,61 @@ V3d_AMBIENT Graphic3d_TOLS_AMBIENT
 V3d_DIRECTIONAL Graphic3d_TOLS_DIRECTIONAL
 V3d_POSITIONAL Graphic3d_TOLS_POSITIONAL
 V3d_SPOT Graphic3d_TOLS_SPOT
+BOPCol_BaseAllocator Handle(NCollection_BaseAllocator)
+BOPCol_BoxBndTree is replaced with BOPTools_BoxBndTree
+BOPCol_DataMapOfIntegerInteger TColStd_DataMapOfIntegerInteger
+BOPCol_DataMapOfIntegerListOfInteger TColStd_DataMapOfIntegerListOfInteger
+BOPCol_DataMapOfIntegerListOfShape TopTools_DataMapOfIntegerListOfShape
+BOPCol_DataMapOfIntegerReal TColStd_DataMapOfIntegerReal
+BOPCol_DataMapOfIntegerShape TopTools_DataMapOfIntegerShape
+BOPCol_DataMapOfShapeBox TopTools_DataMapOfShapeBox
+BOPCol_DataMapOfShapeInteger TopTools_DataMapOfShapeInteger
+BOPCol_DataMapOfShapeListOfShape TopTools_DataMapOfShapeListOfShape
+BOPCol_DataMapOfShapeReal TopTools_DataMapOfShapeReal
+BOPCol_DataMapOfShapeShape TopTools_DataMapOfShapeShape
+BOPCol_IndexedDataMapOfShapeListOfShape TopTools_IndexedDataMapOfShapeListOfShape
+BOPCol_IndexedDataMapOfShapeShape TopTools_IndexedDataMapOfShapeShape
+BOPCol_IndexedMapOfInteger TColStd_IndexedMapOfInteger
+BOPCol_IndexedMapOfOrientedShape TopTools_IndexedMapOfOrientedShape
+BOPCol_IndexedMapOfShape TopTools_IndexedMapOfShape
+BOPCol_ListOfInteger TColStd_ListOfInteger
+BOPCol_ListOfListOfShape TopTools_ListOfListOfShape
+BOPCol_ListOfShape TopTools_ListOfShape
+BOPCol_MapOfInteger TColStd_MapOfInteger
+BOPCol_MapOfOrientedShapeTopTools_MapOfOrientedShape
+BOPCol_MapOfShape TopTools_MapOfShape
+BOPCol_SequenceOfPnt2d TColgp_SequenceOfPnt2d
+BOPCol_SequenceOfReal TColStd_SequenceOfReal
+BOPCol_SequenceOfShape TopTools_SequenceOfShape 
+BOPCol_Parallel BOPTools_Parallel
+BOPCol_NCVector NCollection_Vector
+BOPCol_DataMapOfShapeAddress DataMapOfShapeAddress
+BOPCol_DataMapOfTransientAddress DataMapOfTransientAddress
+BOPCol_DataMapIteratorOfDataMapOfIntegerReal TColStd_DataMapIteratorOfDataMapOfIntegerReal
+BOPCol_DataMapIteratorOfDataMapOfShapeAddress DataMapOfShapeAddress::Iterator
+BOPCol_DataMapIteratorOfDataMapOfTransientAddress DataMapOfTransientAddress::Iterator
+BOPCol_ListIteratorOfListOfInteger TColStd_ListIteratorOfListOfInteger
+BOPCol_ListIteratorOfListOfShape TopTools_ListIteratorOfListOfShape
+BOPCol_MapIteratorOfMapOfInteger TColStd_MapIteratorOfMapOfInteger
+BOPCol_BoxBndTreeSelector BOPTools_BoxBndTreeSelector
+BOPCol_BoxBndTree BOPTools_BoxBndTree
+BOPCol_PListOfInteger TColStd_ListOfInteger*
+BOPCol_IndexedDataMapOfShapeReal TopTools_IndexedDataMapOfShapeReal
+BOPCol_MapOfOrientedShape TopTools_MapOfOrientedShape
+BOPCol_DataMapIteratorOfDataMapOfIntegerInteger TColStd_DataMapIteratorOfDataMapOfIntegerInteger
+BOPCol_MapIteratorOfMapOfShape TopTools_MapIteratorOfMapOfShape
+BOPCol_ContextFunctor BOPTools_ContextFunctor
+BOPCol_ContextCnt BOPTools_ContextCnt
+BOPCol_Functor BOPTools_Functor
+BOPCol_Cnt BOPTools_Cnt
+BOPCol_DataMapIteratorOfDataMapOfIntegerListOfShape TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape
+BOPCol_MapIteratorOfMapOfOrientedShape TopTools_MapIteratorOfMapOfOrientedShape
+BOPCol_DataMapIteratorOfDataMapOfIntegerListOfInteger TColStd_DataMapIteratorOfDataMapOfIntegerListOfInteger
+BOPCol_DataMapIteratorOfDataMapOfShapeShape TopTools_DataMapIteratorOfDataMapOfShapeShape
+BOPTools::MapShapes TopExp::MapShapes
+BOPTools::MapShapesAndAncestors TopExp::MapShapesAndAncestors
+BOPCol_Box2DBndTreeSelector BOPTools_BoxSelector<Bnd_Box2d>
+BiTgte_DataMapOfShapeBox TopTools_DataMapOfShapeBox
 
 [tcollection]
 AdvApp2Var_SequenceOfNode