diff --git a/tests/bugs/caf/buc60756 b/tests/bugs/caf/buc60756
index 65c4fa3cce..1efc4a5430 100755
--- a/tests/bugs/caf/buc60756
+++ b/tests/bugs/caf/buc60756
@@ -5,12 +5,12 @@ puts "BUC60762"
 puts "BUC60764"
 puts "==========="
 
-Open [locate_data_file BUC60756_Doc.std] D
+Open [locate_data_file BUC60756_Doc.cbf] D
 
 ######################################################################
-catch {file delete ${imagedir}/Doc2.std}
+catch {file delete ${imagedir}/Doc2.cbf}
 
-SaveAs D ${imagedir}/Doc2.std
+SaveAs D ${imagedir}/Doc2.cbf
 Close D
-Open ${imagedir}/Doc2.std D 
+Open ${imagedir}/Doc2.cbf D 
 
diff --git a/tests/bugs/caf/buc60790 b/tests/bugs/caf/buc60790
index d8c3f834a1..6dac2e4a12 100755
--- a/tests/bugs/caf/buc60790
+++ b/tests/bugs/caf/buc60790
@@ -5,7 +5,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 set ResultError [BUC60836 D]
diff --git a/tests/bugs/caf/buc60813 b/tests/bugs/caf/buc60813
index 7207bed545..4871ce41ff 100755
--- a/tests/bugs/caf/buc60813
+++ b/tests/bugs/caf/buc60813
@@ -2,7 +2,7 @@ puts "==========="
 puts "BUC60813"
 puts "==========="
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 NewCommand D
diff --git a/tests/bugs/caf/buc60817 b/tests/bugs/caf/buc60817
index 7c9bfbee15..d73ee77c2b 100755
--- a/tests/bugs/caf/buc60817
+++ b/tests/bugs/caf/buc60817
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 NewCommand D
diff --git a/tests/bugs/caf/buc60831 b/tests/bugs/caf/buc60831
index de30a8c5e1..b05fe956e0 100755
--- a/tests/bugs/caf/buc60831
+++ b/tests/bugs/caf/buc60831
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 NewCommand D
diff --git a/tests/bugs/caf/buc60844 b/tests/bugs/caf/buc60844
index e7b378e7e4..9ef64e412f 100755
--- a/tests/bugs/caf/buc60844
+++ b/tests/bugs/caf/buc60844
@@ -3,7 +3,7 @@ puts "BUC60844"
 puts "BUC60845"
 puts "==========="
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 NewCommand D
diff --git a/tests/bugs/caf/buc60847 b/tests/bugs/caf/buc60847
index fe5e7ea784..15509edf18 100755
--- a/tests/bugs/caf/buc60847
+++ b/tests/bugs/caf/buc60847
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 NewCommand D
diff --git a/tests/bugs/caf/buc60862 b/tests/bugs/caf/buc60862
index d4f3dc34f5..84c0b07c8e 100755
--- a/tests/bugs/caf/buc60862
+++ b/tests/bugs/caf/buc60862
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 NewCommand D
diff --git a/tests/bugs/caf/buc60867 b/tests/bugs/caf/buc60867
index 7fc9a65c33..58571b0a69 100755
--- a/tests/bugs/caf/buc60867
+++ b/tests/bugs/caf/buc60867
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-set ResultError [ BUC60867 [locate_data_file BUC60756_Doc.std] ]
+set ResultError [ BUC60867 [locate_data_file BUC60756_Doc.cbf] ]
 
 if { [regexp "0" $ResultError] != 1 } {
     puts "Error : 1"
diff --git a/tests/bugs/caf/buc60910 b/tests/bugs/caf/buc60910
index 2c476496a7..75b7d033b4 100755
--- a/tests/bugs/caf/buc60910
+++ b/tests/bugs/caf/buc60910
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 NewCommand D
diff --git a/tests/bugs/caf/buc60917 b/tests/bugs/caf/buc60917
index 2d52e7453f..11f3827cae 100755
--- a/tests/bugs/caf/buc60917
+++ b/tests/bugs/caf/buc60917
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 box b 10 10 10 
diff --git a/tests/bugs/caf/buc60921 b/tests/bugs/caf/buc60921
index 0dfb9ad2cd..a9fb35bc25 100755
--- a/tests/bugs/caf/buc60921
+++ b/tests/bugs/caf/buc60921
@@ -29,7 +29,7 @@ pload QAcommands
 set BREP [locate_data_file BUC60921.brep]
 #set BREP [locate_data_file Bottom.brep]
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 set i_max 10
diff --git a/tests/bugs/caf/buc60925 b/tests/bugs/caf/buc60925
index 523d0e5622..71d4483964 100755
--- a/tests/bugs/caf/buc60925
+++ b/tests/bugs/caf/buc60925
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 NewCommand D
diff --git a/tests/bugs/caf/bug1029 b/tests/bugs/caf/bug1029
index 6a2e49bf16..7c5092ac15 100755
--- a/tests/bugs/caf/bug1029
+++ b/tests/bugs/caf/bug1029
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/bugs/caf/bug1030 b/tests/bugs/caf/bug1030
index 2c6e965d90..be53659ce7 100755
--- a/tests/bugs/caf/bug1030
+++ b/tests/bugs/caf/bug1030
@@ -7,7 +7,7 @@ puts "================"
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/bugs/caf/bug1031 b/tests/bugs/caf/bug1031
index a9003a0213..ed63fa350e 100755
--- a/tests/bugs/caf/bug1031
+++ b/tests/bugs/caf/bug1031
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/bugs/caf/bug1032 b/tests/bugs/caf/bug1032
index d98eba3052..cfbc597b61 100755
--- a/tests/bugs/caf/bug1032
+++ b/tests/bugs/caf/bug1032
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/bugs/caf/bug1033 b/tests/bugs/caf/bug1033
index 4edeb2c8c2..a208641fdf 100755
--- a/tests/bugs/caf/bug1033
+++ b/tests/bugs/caf/bug1033
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/bugs/caf/bug1034 b/tests/bugs/caf/bug1034
index 3d342b797a..606e095fa4 100755
--- a/tests/bugs/caf/bug1034
+++ b/tests/bugs/caf/bug1034
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/bugs/caf/bug114 b/tests/bugs/caf/bug114
index f0cc17a0e9..d3e31a95a2 100755
--- a/tests/bugs/caf/bug114
+++ b/tests/bugs/caf/bug114
@@ -6,7 +6,7 @@ puts "==========="
 set i_max 10
 puts "Amount of iterations is $i_max"
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 10
 
 restore [locate_data_file OCC294.brep] s
diff --git a/tests/bugs/caf/bug1395_1 b/tests/bugs/caf/bug1395_1
index 3fa884be52..f3fc0180f4 100644
--- a/tests/bugs/caf/bug1395_1
+++ b/tests/bugs/caf/bug1395_1
@@ -14,7 +14,7 @@ puts ""
 set IsGood 1
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label
diff --git a/tests/bugs/caf/bug1395_2 b/tests/bugs/caf/bug1395_2
index 675062b73b..6e6dd4f9b9 100644
--- a/tests/bugs/caf/bug1395_2
+++ b/tests/bugs/caf/bug1395_2
@@ -12,7 +12,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label
diff --git a/tests/bugs/caf/bug1454 b/tests/bugs/caf/bug1454
index 8464ff1367..3bf7e4b96f 100644
--- a/tests/bugs/caf/bug1454
+++ b/tests/bugs/caf/bug1454
@@ -7,7 +7,7 @@ puts "===== OCC1454 ====="
 puts "Info: Open the document with 80000 sublabels of the label 0:2"
 dchrono h reset
 dchrono h start
-Open [locate_data_file OCC1726.std] D
+Open [locate_data_file OCC1726.cbf] D
 dchrono h stop
 set TimeList [dchrono h show]
 
diff --git a/tests/bugs/caf/bug158 b/tests/bugs/caf/bug158
index a6bb271088..e18fb1db38 100755
--- a/tests/bugs/caf/bug158
+++ b/tests/bugs/caf/bug158
@@ -2,13 +2,13 @@ puts "=============="
 puts "OCC158"
 puts "=============="
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 ##################################################################
-if { [catch {set res [SaveAs D ${imagedir}/OCC158.std]}] != 0 } {
+if { [catch {set res [SaveAs D ${imagedir}/OCC158.cbf]}] != 0 } {
   puts "OCC158: Error"
 } else {
-    file delete ${imagedir}/OCC158.std
+    file delete ${imagedir}/OCC158.cbf
 }
 
 
diff --git a/tests/bugs/caf/bug159 b/tests/bugs/caf/bug159
index 7a75d1753e..074b437f3a 100644
--- a/tests/bugs/caf/bug159
+++ b/tests/bugs/caf/bug159
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 set log [OCC159 D]
 
diff --git a/tests/bugs/caf/bug1726 b/tests/bugs/caf/bug1726
index 828829c878..ca371f74e6 100644
--- a/tests/bugs/caf/bug1726
+++ b/tests/bugs/caf/bug1726
@@ -8,7 +8,7 @@ puts ""
 
 puts "Info: Open the document with 80000 sublabels of the label 0:2"
 chrono h reset; chrono h start
-Open [locate_data_file OCC1726.std] D
+Open [locate_data_file OCC1726.cbf] D
 chrono h stop; chrono h show
 
 set IsGood 1
diff --git a/tests/bugs/caf/bug21707 b/tests/bugs/caf/bug21707
index 459b9f091b..dc0d4642df 100644
--- a/tests/bugs/caf/bug21707
+++ b/tests/bugs/caf/bug21707
@@ -6,7 +6,7 @@ puts ""
 # Selection of Vertex returns Compound of vertexes
 ##############################################################
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 isos 12
 NewCommand D
 AddDriver D PntXYZ PntRLT Line3D Attach
diff --git a/tests/bugs/caf/bug22788_1 b/tests/bugs/caf/bug22788_1
index 9bbfbfdfd2..3ffb1aaa47 100755
--- a/tests/bugs/caf/bug22788_1
+++ b/tests/bugs/caf/bug22788_1
@@ -10,9 +10,9 @@ pload QAcommands
 
 set BugNumber OCC22788
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
-set aFile OCC22788.std
+set aFile OCC22788.cbf
 
 Open [locate_data_file ${aFile}] D
 
diff --git a/tests/bugs/caf/bug22788_2 b/tests/bugs/caf/bug22788_2
index cef3dfa8b2..2f86bf2290 100755
--- a/tests/bugs/caf/bug22788_2
+++ b/tests/bugs/caf/bug22788_2
@@ -8,7 +8,7 @@ puts ""
 
 set BugNumber OCC22788
 
-set aFile [locate_data_file OCC22788.std]
+set aFile [locate_data_file OCC22788.cbf]
 
 Open ${aFile} D
 
diff --git a/tests/bugs/caf/bug22995 b/tests/bugs/caf/bug22995
index 257e8d21e3..fb41d08073 100755
--- a/tests/bugs/caf/bug22995
+++ b/tests/bugs/caf/bug22995
@@ -9,10 +9,10 @@ puts ""
 set BugNumber OCC22995
 
 set status 0
-set aFile1 $imagedir/${test_image}-1.std
-set aFile2 $imagedir/${test_image}-2.std
+set aFile1 $imagedir/${test_image}-1.cbf
+set aFile2 $imagedir/${test_image}-2.cbf
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 if { [file exists ${aFile1}] } {
     file delete ${aFile1}
diff --git a/tests/bugs/caf/bug23071 b/tests/bugs/caf/bug23071
index d7e45ab86c..92ee70358f 100755
--- a/tests/bugs/caf/bug23071
+++ b/tests/bugs/caf/bug23071
@@ -8,9 +8,9 @@ puts ""
 
 set BugNumber OCC23071
 
-set FileName $imagedir/${test_image}.STD
-set FileName2 $imagedir/${test_image}.std
-set FileName3 ${FileName}.std
+set FileName $imagedir/${test_image}.CBF
+set FileName2 $imagedir/${test_image}.cbf
+set FileName3 ${FileName}.cbf
 
 set status 0
 
@@ -30,7 +30,7 @@ if [file exists ${FileName3}] {
   set status 1
 }
 
-catch { NewDocument D MDTV-Standard }
+catch { NewDocument D BinOcaf }
 
 if [catch {SaveAs D ${FileName} }] {
   puts "Faulty ${BugNumber} ; SaveAs command: Error"
diff --git a/tests/bugs/caf/bug23489 b/tests/bugs/caf/bug23489
index 83ecea8094..99c2be34a7 100755
--- a/tests/bugs/caf/bug23489
+++ b/tests/bugs/caf/bug23489
@@ -11,7 +11,7 @@ for {set i 1} {$i < 10} {incr i} {
     restore $file a
 
     # add shape to new OCAF document
-    NewDocument D MDTV-Standard
+    NewDocument D BinOcaf
 
     # add shape to document
     SetShape D 0:1 a
diff --git a/tests/bugs/caf/bug23766_2 b/tests/bugs/caf/bug23766_2
index 65245b3eac..3fd43f60fc 100755
--- a/tests/bugs/caf/bug23766_2
+++ b/tests/bugs/caf/bug23766_2
@@ -8,7 +8,7 @@ puts ""
 
 # test to check compatibility of old std format
 
-Open [locate_data_file bug23766_ttt1_old.std] D
+Open [locate_data_file bug23766_ttt1_old.cbf] D
 
 GetShape D 0:1:2:1:2 E1
 set info1 [whatis E1]
diff --git a/tests/bugs/caf/bug23766_5 b/tests/bugs/caf/bug23766_5
index 643dbe0b09..3e9c67d9e6 100755
--- a/tests/bugs/caf/bug23766_5
+++ b/tests/bugs/caf/bug23766_5
@@ -9,7 +9,7 @@ puts ""
 ## test for keeping Orientation (std)
 
 erase
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 #1 - create box
 NewCommand D
 set B2 [AddObject D];			## add object
@@ -50,12 +50,12 @@ if { [regexp "REVERSED" $info2] != 1 } {
 }
 
 #4 -  test persistence: check orientation after retrieving (to be the same as before)
-file delete -force ${imagedir}/bug23766_ttt1.std
+file delete -force ${imagedir}/bug23766_ttt1.cbf
 NewCommand D
-SaveAs D ${imagedir}/bug23766_ttt1.std
+SaveAs D ${imagedir}/bug23766_ttt1.cbf
 Close D
 ##unset D
-Open ${imagedir}/bug23766_ttt1.std D
+Open ${imagedir}/bug23766_ttt1.cbf D
 GetShape D 0:1:2:1:2 E1
 set info3 [whatis E1]
 ## to be: E1 is a shape EDGE FORWARD Modified Orientable
diff --git a/tests/bugs/caf/bug24164_1 b/tests/bugs/caf/bug24164_1
index 18a58ba4bb..dc3f32519b 100644
--- a/tests/bugs/caf/bug24164_1
+++ b/tests/bugs/caf/bug24164_1
@@ -6,7 +6,7 @@ if { [info exists imagedir] == 0 } {
 set BugNumber OCC24164
 
 #1 open new document
-NewDocument  D MDTV-Standard
+NewDocument  D BinOcaf
 UndoLimit D 10 0 0
 InitLogBook D		
 AddDriver D Box
@@ -23,7 +23,7 @@ GetShape D $F2:2 Box2
 NewCommand D
 
 #3 save shape in the document
-SaveAs D ${imagedir}/testDoc1.std
+SaveAs D ${imagedir}/testDoc1.cbf
 
 #4 close document
 set catch_status 0
@@ -37,7 +37,7 @@ if { ${catch_status} != 0 } {
 }
 
 #5 reopen just saved document with the same name
-Open ${imagedir}/testDoc1.std D
+Open ${imagedir}/testDoc1.cbf D
 set catch_status 0
 
 #6 close the document
diff --git a/tests/bugs/caf/bug24164_2 b/tests/bugs/caf/bug24164_2
index c01535d69d..6c423efd78 100644
--- a/tests/bugs/caf/bug24164_2
+++ b/tests/bugs/caf/bug24164_2
@@ -6,7 +6,7 @@ if { [info exists imagedir] == 0 } {
 }
 
 #1 open new document
-NewDocument  D MDTV-Standard
+NewDocument  D BinOcaf
 UndoLimit D 10 0 0
 
 #2 define set of labels
@@ -40,7 +40,7 @@ GetRefArray D $Lab5
 GetRefArray D $Lab6
 
 #6 save the document
-SaveAs D ${imagedir}/testDoc2.std
+SaveAs D ${imagedir}/testDoc2.cbf
 
 #7 close the document
 set catch_status 0
@@ -54,7 +54,7 @@ if { ${catch_status} != 0 } {
 }
 
 #8 reopen just saved document with the same name
-Open ${imagedir}/testDoc2.std D
+Open ${imagedir}/testDoc2.cbf D
 
 #9 close the document
 if { [catch {Close D} catch_result] } {
diff --git a/tests/bugs/caf/bug24869 b/tests/bugs/caf/bug24869
index 39b17debb7..60290ee0a8 100644
--- a/tests/bugs/caf/bug24869
+++ b/tests/bugs/caf/bug24869
@@ -6,7 +6,7 @@ puts ""
 # OCAF testing framework extending
 ###################################################
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 #1 - create box1
 NewCommand D
diff --git a/tests/bugs/caf/bug25394_1 b/tests/bugs/caf/bug25394_1
index 30cfff7430..6e5a1a8543 100755
--- a/tests/bugs/caf/bug25394_1
+++ b/tests/bugs/caf/bug25394_1
@@ -18,7 +18,7 @@
 # 8. check the restored attributes at the specified labels
 # ===============================================
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 # 1.  create BooleanList attribute with empty list
 set Lab1 [Label D 0:1:1]
 SetBooleanList D $Lab1
@@ -50,11 +50,11 @@ set info5 [GetReferenceList D $Lab5]
 # output => "List is empty"
 
 # 6. save the Document in external file
-SaveAs D ${imagedir}/bug26014_test1.std
+SaveAs D ${imagedir}/bug26014_test1.cbf
 Close D
 
 # 7. reopen the Document
-Open ${imagedir}/bug26014_test1.std D
+Open ${imagedir}/bug26014_test1.cbf D
 
 # 8. Check the restored attributes at the specified labels
 set info8 [GetBooleanList D $Lab1]
diff --git a/tests/bugs/caf/bug26061 b/tests/bugs/caf/bug26061
index 5ec3b6b2e6..92852f8d46 100644
--- a/tests/bugs/caf/bug26061
+++ b/tests/bugs/caf/bug26061
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 ## 1. Build Primitive face <f> 
 plane pl 0 0 0 0 0 1
diff --git a/tests/bugs/caf/bug261 b/tests/bugs/caf/bug261
index 667a352d44..0b0bfc4a61 100755
--- a/tests/bugs/caf/bug261
+++ b/tests/bugs/caf/bug261
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 10
 NewCommand D
 SetReal D 0:1 10
diff --git a/tests/bugs/caf/bug26155 b/tests/bugs/caf/bug26155
index 3bf3283fa1..f79a4ca3f7 100644
--- a/tests/bugs/caf/bug26155
+++ b/tests/bugs/caf/bug26155
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 set x_ref 0.0
 set x_tol 0.1
diff --git a/tests/bugs/caf/bug267_1 b/tests/bugs/caf/bug267_1
index 2317d04b44..b204b05223 100644
--- a/tests/bugs/caf/bug267_1
+++ b/tests/bugs/caf/bug267_1
@@ -2,10 +2,10 @@ puts "========"
 puts "OCC267"
 puts "========"
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 ######################################################################
 
-file delete ${imagedir}/OCC267.std
-SaveAs D ${imagedir}/OCC267.std
+file delete ${imagedir}/OCC267.cbf
+SaveAs D ${imagedir}/OCC267.cbf
 
diff --git a/tests/bugs/caf/bug267_2 b/tests/bugs/caf/bug267_2
index b56b6f9397..7aa09c5646 100755
--- a/tests/bugs/caf/bug267_2
+++ b/tests/bugs/caf/bug267_2
@@ -8,9 +8,9 @@ puts "========"
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
-file delete -force ${imagedir}/OCC267.std
-catch { OCC267 D ${imagedir}/OCC267.std } status
+NewDocument D BinOcaf
+file delete -force ${imagedir}/OCC267.cbf
+catch { OCC267 D ${imagedir}/OCC267.cbf } status
 
 set list [split ${status}]
 set index [lsearch -exact ${list} "CDF_StoreStatus"]
diff --git a/tests/bugs/caf/bug2793 b/tests/bugs/caf/bug2793
index 558d277de9..530f600aa8 100644
--- a/tests/bugs/caf/bug2793
+++ b/tests/bugs/caf/bug2793
@@ -6,7 +6,7 @@ puts ""
 # BinOcaf: low performance saving documents with large attributes
 ########################################################################
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 # Loaded shapes for attributes
 restore [locate_data_file Radhaus.brep] shape1
diff --git a/tests/bugs/caf/bug282 b/tests/bugs/caf/bug282
index 82d2a0f451..e6f91439c3 100755
--- a/tests/bugs/caf/bug282
+++ b/tests/bugs/caf/bug282
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 circle acirc 0 0 0 20
 mkedge anEdge acirc
diff --git a/tests/bugs/caf/bug2932_1 b/tests/bugs/caf/bug2932_1
index eeb7c535dc..13e7a76e5b 100755
--- a/tests/bugs/caf/bug2932_1
+++ b/tests/bugs/caf/bug2932_1
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_10 b/tests/bugs/caf/bug2932_10
index 1ecb6b3e98..2af067c797 100644
--- a/tests/bugs/caf/bug2932_10
+++ b/tests/bugs/caf/bug2932_10
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_11 b/tests/bugs/caf/bug2932_11
index 63cd95fb09..decd051c37 100644
--- a/tests/bugs/caf/bug2932_11
+++ b/tests/bugs/caf/bug2932_11
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_12 b/tests/bugs/caf/bug2932_12
index a10a4a4ebd..42b50800ad 100644
--- a/tests/bugs/caf/bug2932_12
+++ b/tests/bugs/caf/bug2932_12
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_13 b/tests/bugs/caf/bug2932_13
index 9dcc0d487e..b64b685665 100644
--- a/tests/bugs/caf/bug2932_13
+++ b/tests/bugs/caf/bug2932_13
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_14 b/tests/bugs/caf/bug2932_14
index 12e6646509..a1efeaf684 100644
--- a/tests/bugs/caf/bug2932_14
+++ b/tests/bugs/caf/bug2932_14
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_15 b/tests/bugs/caf/bug2932_15
index 206d725050..01b79f16c3 100644
--- a/tests/bugs/caf/bug2932_15
+++ b/tests/bugs/caf/bug2932_15
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_16 b/tests/bugs/caf/bug2932_16
index 9c24014ce4..2a0abb62d8 100644
--- a/tests/bugs/caf/bug2932_16
+++ b/tests/bugs/caf/bug2932_16
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_17 b/tests/bugs/caf/bug2932_17
index ce75699b9e..da1cd7c0aa 100644
--- a/tests/bugs/caf/bug2932_17
+++ b/tests/bugs/caf/bug2932_17
@@ -11,7 +11,7 @@ puts ""
 pload QAcommands
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_18 b/tests/bugs/caf/bug2932_18
index 56e413b92f..821b5cd0a7 100644
--- a/tests/bugs/caf/bug2932_18
+++ b/tests/bugs/caf/bug2932_18
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_19 b/tests/bugs/caf/bug2932_19
index 50d48f055c..20d7983837 100644
--- a/tests/bugs/caf/bug2932_19
+++ b/tests/bugs/caf/bug2932_19
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_2 b/tests/bugs/caf/bug2932_2
index b11432140d..3bec14535c 100755
--- a/tests/bugs/caf/bug2932_2
+++ b/tests/bugs/caf/bug2932_2
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_20 b/tests/bugs/caf/bug2932_20
index 296f68887a..413719ebea 100644
--- a/tests/bugs/caf/bug2932_20
+++ b/tests/bugs/caf/bug2932_20
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_21 b/tests/bugs/caf/bug2932_21
index 0b06ca5380..7a1e53c11c 100644
--- a/tests/bugs/caf/bug2932_21
+++ b/tests/bugs/caf/bug2932_21
@@ -11,7 +11,7 @@ puts ""
 pload QAcommands
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_22 b/tests/bugs/caf/bug2932_22
index bd54e650b7..89c005fa8c 100644
--- a/tests/bugs/caf/bug2932_22
+++ b/tests/bugs/caf/bug2932_22
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_23 b/tests/bugs/caf/bug2932_23
index c8d7c80270..d925e734bf 100644
--- a/tests/bugs/caf/bug2932_23
+++ b/tests/bugs/caf/bug2932_23
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_24 b/tests/bugs/caf/bug2932_24
index cfff758a76..3d829dd242 100644
--- a/tests/bugs/caf/bug2932_24
+++ b/tests/bugs/caf/bug2932_24
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_3 b/tests/bugs/caf/bug2932_3
index 4a34df92f4..5426af492c 100644
--- a/tests/bugs/caf/bug2932_3
+++ b/tests/bugs/caf/bug2932_3
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_4 b/tests/bugs/caf/bug2932_4
index ebae92cebc..29637202a2 100644
--- a/tests/bugs/caf/bug2932_4
+++ b/tests/bugs/caf/bug2932_4
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_5 b/tests/bugs/caf/bug2932_5
index 5f0d918013..ca9d8e1c3a 100644
--- a/tests/bugs/caf/bug2932_5
+++ b/tests/bugs/caf/bug2932_5
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_6 b/tests/bugs/caf/bug2932_6
index 2572b57118..d446fced8c 100644
--- a/tests/bugs/caf/bug2932_6
+++ b/tests/bugs/caf/bug2932_6
@@ -11,7 +11,7 @@ puts ""
 pload QAcommands
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_7 b/tests/bugs/caf/bug2932_7
index 05622df47c..e8d2af4d66 100644
--- a/tests/bugs/caf/bug2932_7
+++ b/tests/bugs/caf/bug2932_7
@@ -11,7 +11,7 @@ puts ""
 pload QAcommands
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_8 b/tests/bugs/caf/bug2932_8
index d42419c1f6..50ed06341f 100644
--- a/tests/bugs/caf/bug2932_8
+++ b/tests/bugs/caf/bug2932_8
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug2932_9 b/tests/bugs/caf/bug2932_9
index 59fa3d0156..7b391945c5 100644
--- a/tests/bugs/caf/bug2932_9
+++ b/tests/bugs/caf/bug2932_9
@@ -9,7 +9,7 @@ puts ""
 #######################################################################################
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Create a label and set attributes
diff --git a/tests/bugs/caf/bug350 b/tests/bugs/caf/bug350
index 827491185a..4baf374ab2 100755
--- a/tests/bugs/caf/bug350
+++ b/tests/bugs/caf/bug350
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 vertex v1 0 0 -50
 vertex v2 0 100 -50
diff --git a/tests/bugs/caf/bug351 b/tests/bugs/caf/bug351
index c5b2ea4c90..c102916324 100755
--- a/tests/bugs/caf/bug351
+++ b/tests/bugs/caf/bug351
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 NameBox D 0:1 100 100 100
 NamePrism D 0:2 0:1:1 200 -1 0 0
diff --git a/tests/bugs/caf/bug352 b/tests/bugs/caf/bug352
index 88a5647c3a..1e5ae08160 100755
--- a/tests/bugs/caf/bug352
+++ b/tests/bugs/caf/bug352
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 NameBox D 0:1 100 100 100
 box abox 100 100 100
diff --git a/tests/bugs/caf/bug355 b/tests/bugs/caf/bug355
index ae7d1733e1..e9e82f5cdb 100755
--- a/tests/bugs/caf/bug355
+++ b/tests/bugs/caf/bug355
@@ -4,7 +4,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 NameCylinder D 0:1 20 100 0 Solid
 NamePrism D 0:2 0:1:2 50 0 0 1
diff --git a/tests/bugs/caf/bug361 b/tests/bugs/caf/bug361
index 51aacc942b..c5167ac50d 100755
--- a/tests/bugs/caf/bug361
+++ b/tests/bugs/caf/bug361
@@ -5,7 +5,7 @@ puts "================="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 if { [catch { OCC361 D }] } {
     puts "OCC361: Error"
diff --git a/tests/bugs/caf/bug381_1 b/tests/bugs/caf/bug381_1
index 4c5b9933f5..854526ece5 100755
--- a/tests/bugs/caf/bug381_1
+++ b/tests/bugs/caf/bug381_1
@@ -5,14 +5,14 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 ######################################################
-catch { SaveAs D ${imagedir}/OCC381_1.std }
+catch { SaveAs D ${imagedir}/OCC381_1.cbf }
 
 if { [catch { OCC381_Save D } ] } {
     puts "OCC381: Error" 
 } else {
-    catch { exec chmod 777 ${imagedir}/OCC381_1.std }
-    file delete -force ${imagedir}/OCC381_1.std
+    catch { exec chmod 777 ${imagedir}/OCC381_1.cbf }
+    file delete -force ${imagedir}/OCC381_1.cbf
 }
diff --git a/tests/bugs/caf/bug381_2 b/tests/bugs/caf/bug381_2
index 019529998a..3574afa08d 100755
--- a/tests/bugs/caf/bug381_2
+++ b/tests/bugs/caf/bug381_2
@@ -5,13 +5,13 @@ puts ""
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 ######################################################
-if { [catch { OCC381_SaveAs D ${imagedir}/OCC381_2.std}] } {
+if { [catch { OCC381_SaveAs D ${imagedir}/OCC381_2.cbf}] } {
     puts "OCC381: Error" 
 } else {
-    catch {exec chmod 777 ${imagedir}/OCC381_2.std}
-    file delete -force ${imagedir}/OCC381_2.std
+    catch {exec chmod 777 ${imagedir}/OCC381_2.cbf}
+    file delete -force ${imagedir}/OCC381_2.cbf
 }
 
diff --git a/tests/bugs/caf/bug387 b/tests/bugs/caf/bug387
index f3f84ff44b..3cc7f5bc65 100755
--- a/tests/bugs/caf/bug387
+++ b/tests/bugs/caf/bug387
@@ -3,7 +3,7 @@ puts "OCC387"
 puts "SAM1452"
 puts "==========="
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 10
 NewCommand D
 SetVariable D 0:1 0 a
diff --git a/tests/bugs/caf/bug425 b/tests/bugs/caf/bug425
index 98a11b5bbc..5d236be692 100755
--- a/tests/bugs/caf/bug425
+++ b/tests/bugs/caf/bug425
@@ -10,7 +10,7 @@ puts "==========="
 
 set IsGood 1
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 10
 
 # Add an attribute to a data framework
@@ -23,7 +23,7 @@ SetName D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/OCC425.std
+set aFile ${imagedir}/OCC425.cbf
 catch {file delete ${aFile}}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/bugs/caf/bug5023 b/tests/bugs/caf/bug5023
index 4f255adf8d..4598c2d170 100755
--- a/tests/bugs/caf/bug5023
+++ b/tests/bugs/caf/bug5023
@@ -6,7 +6,7 @@ puts ""
 # Performance regression in opening OCAF file
 ######################################################
 
-set aFile [locate_data_file OCC5023.std]
+set aFile [locate_data_file OCC5023.cbf]
 
 puts "Info: Restore the document"
 
diff --git a/tests/bugs/caf/bug73_1 b/tests/bugs/caf/bug73_1
index 7049532680..86d8c09553 100755
--- a/tests/bugs/caf/bug73_1
+++ b/tests/bugs/caf/bug73_1
@@ -5,7 +5,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 10
 
 # Close/Open transaction
diff --git a/tests/bugs/caf/bug73_2 b/tests/bugs/caf/bug73_2
index cd8e92839d..081601f1ef 100755
--- a/tests/bugs/caf/bug73_2
+++ b/tests/bugs/caf/bug73_2
@@ -5,7 +5,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 10
 
 # Close/Open transaction
diff --git a/tests/bugs/caf/bug73_3 b/tests/bugs/caf/bug73_3
index a9cb3ababe..c459c21301 100755
--- a/tests/bugs/caf/bug73_3
+++ b/tests/bugs/caf/bug73_3
@@ -5,7 +5,7 @@ puts "==========="
 
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 10
 
 # Close/Open transaction
diff --git a/tests/bugs/modalg_2/bug22770_1 b/tests/bugs/modalg_2/bug22770_1
index e78802cf50..57fcb2fb66 100755
--- a/tests/bugs/modalg_2/bug22770_1
+++ b/tests/bugs/modalg_2/bug22770_1
@@ -11,7 +11,7 @@ set BugNumber OCC22770
 catch { pload XDE }
 
 # Create a new document and set UndoLimit
-# NewDocument D MDTV-XCAF
+# NewDocument D BinXCAF
 # UndoLimit D 100
 # Open a transaction
 # NewCommand D
diff --git a/tests/bugs/modalg_2/bug22770_13 b/tests/bugs/modalg_2/bug22770_13
index b313aabcd4..eb383db826 100755
--- a/tests/bugs/modalg_2/bug22770_13
+++ b/tests/bugs/modalg_2/bug22770_13
@@ -18,7 +18,7 @@ catch { pload XDE }
 
 # Create a new document and set UndoLimit
 
-# NewDocument D MDTV-XCAF
+# NewDocument D BinXCAF
 # UndoLimit D 100
 
 # Open a transaction
diff --git a/tests/bugs/modalg_2/bug22770_15 b/tests/bugs/modalg_2/bug22770_15
index ee0acdbc0b..63ee6ed629 100755
--- a/tests/bugs/modalg_2/bug22770_15
+++ b/tests/bugs/modalg_2/bug22770_15
@@ -18,7 +18,7 @@ catch { pload XDE }
 
 # Create a new document and set UndoLimit
 
-# NewDocument D MDTV-XCAF
+# NewDocument D BinXCAF
 # UndoLimit D 100
 
 # Open a transaction
diff --git a/tests/bugs/modalg_2/bug22770_2 b/tests/bugs/modalg_2/bug22770_2
index 3faf877d34..49a3d0ae21 100755
--- a/tests/bugs/modalg_2/bug22770_2
+++ b/tests/bugs/modalg_2/bug22770_2
@@ -11,7 +11,7 @@ set BugNumber OCC22770
 catch { pload XDE }
 
 # Create a new document and set UndoLimit
-# NewDocument D MDTV-XCAF
+# NewDocument D BinXCAF
 # UndoLimit D 100
 # Open a transaction
 # NewCommand D
diff --git a/tests/bugs/modalg_2/bug22770_3 b/tests/bugs/modalg_2/bug22770_3
index 15c7ffcc46..4dfcd74b4f 100755
--- a/tests/bugs/modalg_2/bug22770_3
+++ b/tests/bugs/modalg_2/bug22770_3
@@ -11,7 +11,7 @@ set BugNumber OCC22770
 catch { pload XDE }
 
 # Create a new document and set UndoLimit
-# NewDocument D MDTV-XCAF
+# NewDocument D BinXCAF
 # UndoLimit D 100
 # Open a transaction
 # NewCommand D
diff --git a/tests/bugs/modalg_4/bug363_1 b/tests/bugs/modalg_4/bug363_1
index ff58b6b179..b6e057a0e7 100644
--- a/tests/bugs/modalg_4/bug363_1
+++ b/tests/bugs/modalg_4/bug363_1
@@ -13,9 +13,9 @@ puts ""
 ######################################################################
 #set filedir $env(TmpDir)
 #puts $filedir
-#catch {exec rm $filedir/OCC363.dxc}
+#catch {exec rm $filedir/OCC363.xbf}
 pload XDE
 
-set T [OCC363 OCC363Doc [locate_data_file OCC363.dxc]]
+set T [OCC363 OCC363Doc [locate_data_file OCC363.xbf]]
 puts $T
 
diff --git a/tests/bugs/modalg_4/bug8228 b/tests/bugs/modalg_4/bug8228
index 570e5e26f9..8946b337c4 100755
--- a/tests/bugs/modalg_4/bug8228
+++ b/tests/bugs/modalg_4/bug8228
@@ -13,7 +13,7 @@ catch {pload DCAF}
 
 # Create a new document and set UndoLimit
 
-NewDocument D MDTV-XCAF
+NewDocument D BinXCAF
 UndoLimit D 100
 
 # Open a transaction
diff --git a/tests/bugs/modalg_5/bug24849_1 b/tests/bugs/modalg_5/bug24849_1
index 0d264a8663..39e41792e7 100644
--- a/tests/bugs/modalg_5/bug24849_1
+++ b/tests/bugs/modalg_5/bug24849_1
@@ -8,7 +8,7 @@ puts ""
 
 pload DCAF
 
-Open [locate_data_file bug24849_Study1_GEOM.sgd] D
+Open [locate_data_file bug24849_Study1_GEOM.cbf] D
 
 GetShape D 0:1:465:1:1:2 f
 GetShape D 0:1:283:1:1:2 w
diff --git a/tests/bugs/modalg_5/bug24849_2 b/tests/bugs/modalg_5/bug24849_2
index e201da8a2c..c4b91c4961 100644
--- a/tests/bugs/modalg_5/bug24849_2
+++ b/tests/bugs/modalg_5/bug24849_2
@@ -8,7 +8,7 @@ puts ""
 
 pload DCAF
 
-Open [locate_data_file bug24849_Study1_GEOM.sgd] D
+Open [locate_data_file bug24849_Study1_GEOM.cbf] D
 
 GetShape D 0:1:465:1:1:2 f
 GetShape D 0:1:283:1:1:2 w
diff --git a/tests/bugs/modalg_5/bug25969 b/tests/bugs/modalg_5/bug25969
index a67278601f..57170c1ee0 100644
--- a/tests/bugs/modalg_5/bug25969
+++ b/tests/bugs/modalg_5/bug25969
@@ -8,7 +8,7 @@ puts ""
 
 pload DCAF
 
-Open [locate_data_file bug25969_pal22851.sgd] D
+Open [locate_data_file bug25969_pal22851.cbf] D
 
 GetShape D 0:1:15:1:1:2 b1
 GetShape D 0:1:29:1:1:2 b2
diff --git a/tests/bugs/moddata_3/bug23733 b/tests/bugs/moddata_3/bug23733
index e80fd46c2c..53b2c07f58 100644
--- a/tests/bugs/moddata_3/bug23733
+++ b/tests/bugs/moddata_3/bug23733
@@ -8,7 +8,7 @@ puts ""
 
 pload DCAF TOPTEST
 
-Open [locate_data_file bug_glue_edges_GEOM.sgd] D
+Open [locate_data_file bug_glue_edges_GEOM.cbf] D
 
 GetShape D 0:1:9686:1:1:2 s1
 GetShape D 0:1:9449:1:1:2 s2
diff --git a/tests/bugs/xde/bug22776 b/tests/bugs/xde/bug22776
index a02b55c192..5f108465e2 100755
--- a/tests/bugs/xde/bug22776
+++ b/tests/bugs/xde/bug22776
@@ -9,7 +9,7 @@ puts ""
 catch {pload DCAF}
 pload QAcommands
 
-NewDocument D MDTV-Standard
+NewDocument D BinXCAF
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/bugs/xde/bug22982 b/tests/bugs/xde/bug22982
index 0bd45bc4bd..647f45b839 100755
--- a/tests/bugs/xde/bug22982
+++ b/tests/bugs/xde/bug22982
@@ -13,7 +13,7 @@ puts ""
 set BugNumber OCC22982
 pload DCAF
 
-NewDocument D11 MDTV-XCAF
+NewDocument D11 BinXCAF
 UndoLimit D11 100
 
 # Open a transaction
@@ -62,7 +62,7 @@ NewCommand D11
 file delete -force ${imagedir}/${test_image}.step
 WriteStep D11 ${imagedir}/${test_image}.step
 
-NewDocument D2 MDTV-XCAF
+NewDocument D2 BinXCAF
 UndoLimit D2 100
 
 # Close/Open a transaction
diff --git a/tests/bugs/xde/bug23384 b/tests/bugs/xde/bug23384
index 7e2f4c6019..7b3deb1eee 100755
--- a/tests/bugs/xde/bug23384
+++ b/tests/bugs/xde/bug23384
@@ -4,7 +4,7 @@
 if {[array get env os_type] != ""} {
     set os $env(os_type)
 }
-XOpen [locate_data_file bug23384-doc_subshapes.dxc] doc
+XOpen [locate_data_file bug23384-doc_subshapes.xbf] doc
 set info1 [XStat doc]
 regexp {level N 0 +: +([-0-9.+eE]+)} $info1 full l0
 regexp {level N 1 +: +([-0-9.+eE]+)} $info1 full l1
diff --git a/tests/bugs/xde/bug23736 b/tests/bugs/xde/bug23736
index c31de25f66..5db5b181ba 100644
--- a/tests/bugs/xde/bug23736
+++ b/tests/bugs/xde/bug23736
@@ -8,7 +8,7 @@ puts ""
 
 pload DCAF
 
-NewDocument D MDTV-XCAF
+NewDocument D BinXCAF
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/bugs/xde/bug3926 b/tests/bugs/xde/bug3926
index 00a4778ebd..6625ef0124 100644
--- a/tests/bugs/xde/bug3926
+++ b/tests/bugs/xde/bug3926
@@ -8,7 +8,7 @@ puts ""
 
 pload DCAF
 
-NewDocument D MDTV-XCAF
+NewDocument D BinXCAF
 UndoLimit D 100
 NewCommand D
 
diff --git a/tests/caf/basic/A3 b/tests/caf/basic/A3
index 4ef398f18c..737c0cb91f 100755
--- a/tests/caf/basic/A3
+++ b/tests/caf/basic/A3
@@ -18,7 +18,7 @@ SetInteger D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-A3.std
+set aFile ${imagedir}/caf001-A3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/B3 b/tests/caf/basic/B3
index a40dba4dfe..35421dfa0e 100755
--- a/tests/caf/basic/B3
+++ b/tests/caf/basic/B3
@@ -18,7 +18,7 @@ SetReal D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-B3.std
+set aFile ${imagedir}/caf001-B3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/C3 b/tests/caf/basic/C3
index 798019f998..781f6df0f3 100755
--- a/tests/caf/basic/C3
+++ b/tests/caf/basic/C3
@@ -23,7 +23,7 @@ SetRealArray D ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSetAttr12
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-C3.std
+set aFile ${imagedir}/caf001-C3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/D3 b/tests/caf/basic/D3
index 6a8938fdd1..787b78071b 100755
--- a/tests/caf/basic/D3
+++ b/tests/caf/basic/D3
@@ -23,7 +23,7 @@ SetIntArray D ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSetAttr12}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-D3.std
+set aFile ${imagedir}/caf001-D3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/E3 b/tests/caf/basic/E3
index 2cac769922..c43ce2f6ce 100755
--- a/tests/caf/basic/E3
+++ b/tests/caf/basic/E3
@@ -19,7 +19,7 @@ SetName D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-E3.std
+set aFile ${imagedir}/caf001-E3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/F3 b/tests/caf/basic/F3
index ef6050feac..2193091697 100755
--- a/tests/caf/basic/F3
+++ b/tests/caf/basic/F3
@@ -19,7 +19,7 @@ SetComment D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-F3.std
+set aFile ${imagedir}/caf001-F3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/G3 b/tests/caf/basic/G3
index b7b9866d46..cf10835ebf 100755
--- a/tests/caf/basic/G3
+++ b/tests/caf/basic/G3
@@ -35,7 +35,7 @@ SetPoint D ${aLabel} aPoint1
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-G3.std
+set aFile ${imagedir}/caf001-G3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/H3 b/tests/caf/basic/H3
index 0af9ba5a40..16e76f2762 100755
--- a/tests/caf/basic/H3
+++ b/tests/caf/basic/H3
@@ -43,7 +43,7 @@ SetAxis D ${aLabel} aLine1
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-H3.std
+set aFile ${imagedir}/caf001-H3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/I3 b/tests/caf/basic/I3
index ffcb9ebb17..71b77e121f 100755
--- a/tests/caf/basic/I3
+++ b/tests/caf/basic/I3
@@ -46,7 +46,7 @@ SetPlane D ${aLabel} aPlane1
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-I3.std
+set aFile ${imagedir}/caf001-I3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/J3 b/tests/caf/basic/J3
index c44be10efc..9c6c9037f1 100755
--- a/tests/caf/basic/J3
+++ b/tests/caf/basic/J3
@@ -18,7 +18,7 @@ SetUAttribute D ${aLabel} ${aSetAttr1}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-J3.std
+set aFile ${imagedir}/caf001-J3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/J6 b/tests/caf/basic/J6
index 21543f8253..3f9722ac42 100755
--- a/tests/caf/basic/J6
+++ b/tests/caf/basic/J6
@@ -24,7 +24,7 @@ set aGetAttr2 [GetUAttribute D ${aLabel} ${aSetAttr2}]
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-J6.std
+set aFile ${imagedir}/caf001-J6.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/K3 b/tests/caf/basic/K3
index 067a58e67a..41e8f853b3 100755
--- a/tests/caf/basic/K3
+++ b/tests/caf/basic/K3
@@ -34,7 +34,7 @@ SetShape D ${aLabel} aBox1
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-K3.std
+set aFile ${imagedir}/caf001-K3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/L3 b/tests/caf/basic/L3
index e2c43b1c7c..11fe36c5a0 100755
--- a/tests/caf/basic/L3
+++ b/tests/caf/basic/L3
@@ -28,7 +28,7 @@ SetReference D ${aLabel4} ${aReference1}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-L3.std
+set aFile ${imagedir}/caf001-L3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/basic/M3 b/tests/caf/basic/M3
index 03bad2e176..8c96fe813a 100755
--- a/tests/caf/basic/M3
+++ b/tests/caf/basic/M3
@@ -31,7 +31,7 @@ SetExtStringArray D ${aLabel} ${isDelta} ${aFrom1} ${aTo1} ${aSetAttr11} ${aSetA
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-M3.std
+set aFile ${imagedir}/caf001-M3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/begin b/tests/caf/begin
index 140a347bb6..08a134c46b 100755
--- a/tests/caf/begin
+++ b/tests/caf/begin
@@ -6,7 +6,7 @@ if { [array get Draw_Groups "DF basic commands"] == "" } {
 
 chrono qat start
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 #NewDocument D
 cpulimit 300
diff --git a/tests/caf/named_shape/C1 b/tests/caf/named_shape/C1
index 0d272002b7..48fd5f0a64 100755
--- a/tests/caf/named_shape/C1
+++ b/tests/caf/named_shape/C1
@@ -40,7 +40,7 @@ SetShape D ${aLabel} aBox1
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf002-C1.std
+set aFile ${imagedir}/caf002-C1.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 #catch {exec chmod 777 ${aFile}}
diff --git a/tests/caf/named_shape/E1 b/tests/caf/named_shape/E1
index c36b93e0f5..e26a85be21 100755
--- a/tests/caf/named_shape/E1
+++ b/tests/caf/named_shape/E1
@@ -19,7 +19,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 isos 12
 #1 - create box using more flexible set of commands
 NewCommand D
diff --git a/tests/caf/named_shape/E2 b/tests/caf/named_shape/E2
index 30691cd6e0..711c186c36 100755
--- a/tests/caf/named_shape/E2
+++ b/tests/caf/named_shape/E2
@@ -19,7 +19,7 @@
 erase
 Close D
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 #Drivers' nick-names:
 #Box|Sph|Cyl|Cut|Fuse|Prism|Revol|PTxyz|PTALine|PRLine|PMirr|Fillet|Attach|XAttach
diff --git a/tests/caf/named_shape/E3 b/tests/caf/named_shape/E3
index c752b15efc..e3da7053bf 100755
--- a/tests/caf/named_shape/E3
+++ b/tests/caf/named_shape/E3
@@ -18,7 +18,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 AddDriver D Box Cyl Sph Attach XAttach PTxyz PTALine PRLine PMirr Cut Fuse Prism FulRevol SecRevol Fillet
 #1 Box creation
diff --git a/tests/caf/named_shape/E4 b/tests/caf/named_shape/E4
index ee82d1a9cc..0cceef75da 100755
--- a/tests/caf/named_shape/E4
+++ b/tests/caf/named_shape/E4
@@ -18,7 +18,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 AddDriver D Box Cyl Sph Attach XAttach PTxyz PTALine PRLine PMirr Cut Fuse Prism FulRevol SecRevol Fillet
 
diff --git a/tests/caf/named_shape/E5 b/tests/caf/named_shape/E5
index 62b506a7ca..d5626b8b6b 100755
--- a/tests/caf/named_shape/E5
+++ b/tests/caf/named_shape/E5
@@ -18,7 +18,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 AddDriver D Box Cyl Sph Attach XAttach PTxyz PTALine PRLine PMirr Cut Fuse Prism FulRevol SecRevol Fillet
 
diff --git a/tests/caf/named_shape/E6 b/tests/caf/named_shape/E6
index ec81f8981e..ed0bacba3a 100755
--- a/tests/caf/named_shape/E6
+++ b/tests/caf/named_shape/E6
@@ -22,7 +22,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 #1 - create Box using short-cut
 NewCommand D
diff --git a/tests/caf/named_shape/E7 b/tests/caf/named_shape/E7
index 7a0e2ac99f..c68f2b3d2b 100755
--- a/tests/caf/named_shape/E7
+++ b/tests/caf/named_shape/E7
@@ -22,7 +22,7 @@
 erase
 Close D
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 #Drivers' nick-names:
 #Box|Sph|Cyl|Cut|Fuse|Prism|SecRevol|FulRevol|PTxyz|PTALine|PRLine|PMirr|Fillet|Attach|XAttach
diff --git a/tests/caf/named_shape/E8 b/tests/caf/named_shape/E8
index a8d6864fe2..1a4100a9c5 100755
--- a/tests/caf/named_shape/E8
+++ b/tests/caf/named_shape/E8
@@ -20,7 +20,7 @@
 erase
 Close D
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 #Drivers' nick-names:
 #Box|Sph|Cyl|Cut|Fuse|Prism|SecRevol|FulRevol|PTxyz|PTALine|PRLine|PMirr|Fillet|Attach|XAttach
diff --git a/tests/caf/named_shape/E9 b/tests/caf/named_shape/E9
index 1223e9d578..509792178a 100755
--- a/tests/caf/named_shape/E9
+++ b/tests/caf/named_shape/E9
@@ -19,7 +19,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 isos 12
 
 #1 - create Box using short-cut
diff --git a/tests/caf/named_shape/F1 b/tests/caf/named_shape/F1
index aced514bb1..62e4b96951 100755
--- a/tests/caf/named_shape/F1
+++ b/tests/caf/named_shape/F1
@@ -23,7 +23,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 AddDriver D Box Cyl Sph Attach XAttach PTxyz PTALine PRLine PMirr Cut Fuse Prism FulRevol SecRevol Fillet
 
 #1 Create Box
diff --git a/tests/caf/named_shape/F2 b/tests/caf/named_shape/F2
index d38957ad4d..8f32cd2463 100755
--- a/tests/caf/named_shape/F2
+++ b/tests/caf/named_shape/F2
@@ -20,7 +20,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 isos 12
 #1 - create Box using short-cut
 NewCommand D
diff --git a/tests/caf/named_shape/F3 b/tests/caf/named_shape/F3
index 74733f9783..ec997308f1 100755
--- a/tests/caf/named_shape/F3
+++ b/tests/caf/named_shape/F3
@@ -26,7 +26,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 isos 12
 #1 - create Box using short-cut
 NewCommand D
diff --git a/tests/caf/named_shape/F4 b/tests/caf/named_shape/F4
index 8f39e59b87..b8567e2f7f 100755
--- a/tests/caf/named_shape/F4
+++ b/tests/caf/named_shape/F4
@@ -18,7 +18,7 @@
 erase
 Close D
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 
 #Drivers' nick-names:
 #Box|Sph|Cyl|Cut|Fuse|Prism|SecRevol|FulRevol|PTxyz|PTALine|PRLine|PMirr|Fillet|Attach|XAttach
diff --git a/tests/caf/named_shape/F5 b/tests/caf/named_shape/F5
index 347a550c8c..1ff426cd89 100755
--- a/tests/caf/named_shape/F5
+++ b/tests/caf/named_shape/F5
@@ -21,7 +21,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 isos 12
 
 #1 - create 4 Pnts
diff --git a/tests/caf/named_shape/F6 b/tests/caf/named_shape/F6
index 8f9878983d..7485059b0b 100755
--- a/tests/caf/named_shape/F6
+++ b/tests/caf/named_shape/F6
@@ -23,7 +23,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 isos 12
 
 #1 - create 4 Pnts
diff --git a/tests/caf/named_shape/F7 b/tests/caf/named_shape/F7
index 7cd6bb7279..66069267f4 100644
--- a/tests/caf/named_shape/F7
+++ b/tests/caf/named_shape/F7
@@ -22,7 +22,7 @@
 erase 
 Close D 
 
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 isos 12
 
 #1 - create 4 Pnts
diff --git a/tests/caf/named_shape/F8 b/tests/caf/named_shape/F8
index ed955dd9e1..2d00b9cf6b 100755
--- a/tests/caf/named_shape/F8
+++ b/tests/caf/named_shape/F8
@@ -16,7 +16,7 @@
 
 pload FULL
 set doc d16
-NewDocument $doc MDTV-Standard
+NewDocument $doc BinOcaf
 AddDriver $doc Box Fuse Attach
 
 #1. create 3 boxes
diff --git a/tests/caf/named_shape/F9 b/tests/caf/named_shape/F9
index 7f348fbbd6..4b8e16d85e 100755
--- a/tests/caf/named_shape/F9
+++ b/tests/caf/named_shape/F9
@@ -16,7 +16,7 @@
 
 pload FULL
 set doc d16
-NewDocument $doc MDTV-Standard
+NewDocument $doc BinOcaf
 AddDriver $doc Box Fuse Attach
 #1.create 3 boxes
 set B1 [AddBox $doc 100 200 350]
diff --git a/tests/caf/presentation/A4 b/tests/caf/presentation/A4
index 6a7f5803ff..b1dd78b6c1 100755
--- a/tests/caf/presentation/A4
+++ b/tests/caf/presentation/A4
@@ -23,7 +23,7 @@ AISSet D ${aLabel} NS
 AISDisplay D ${aLabel}
 
 # Save the document
-set aFile ${imagedir}/caf003-A4.std
+set aFile ${imagedir}/caf003-A4.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/tree/A3 b/tests/caf/tree/A3
index 60272ba373..709e7d8d24 100755
--- a/tests/caf/tree/A3
+++ b/tests/caf/tree/A3
@@ -25,7 +25,7 @@ SetName D ${aChild1} ${aName11}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf005-A3.std
+set aFile ${imagedir}/caf005-A3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/tree/B3 b/tests/caf/tree/B3
index d7b3e83301..84bab9be62 100755
--- a/tests/caf/tree/B3
+++ b/tests/caf/tree/B3
@@ -18,7 +18,7 @@ SetName D ${aLabel1} ${aName1}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf001-B3.std
+set aFile ${imagedir}/caf001-B3.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/tree/C2 b/tests/caf/tree/C2
index be83c2dbfd..8452f7ac39 100755
--- a/tests/caf/tree/C2
+++ b/tests/caf/tree/C2
@@ -21,7 +21,7 @@ SetNode D ${aLabel_Root}
 NewCommand D
 
 # Save the document
-set aFile ${imagedir}/caf005-C2.std
+set aFile ${imagedir}/caf005-C2.cbf
 file delete ${aFile}
 SaveAs D ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/xlink/A1 b/tests/caf/xlink/A1
index 29aad59288..089b05bb06 100755
--- a/tests/caf/xlink/A1
+++ b/tests/caf/xlink/A1
@@ -9,8 +9,8 @@
 puts "caf004-A1"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/caf/xlink/A2 b/tests/caf/xlink/A2
index 55326056d8..ac615da762 100755
--- a/tests/caf/xlink/A2
+++ b/tests/caf/xlink/A2
@@ -9,8 +9,8 @@
 puts "caf004-A2"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/caf/xlink/B1 b/tests/caf/xlink/B1
index 94f000bc4c..3a916102fd 100755
--- a/tests/caf/xlink/B1
+++ b/tests/caf/xlink/B1
@@ -9,8 +9,8 @@
 puts "caf004-B1"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/caf/xlink/B2 b/tests/caf/xlink/B2
index 334ab5ddba..9864c245ff 100755
--- a/tests/caf/xlink/B2
+++ b/tests/caf/xlink/B2
@@ -9,8 +9,8 @@
 puts "caf004-B2"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/caf/xlink/B3 b/tests/caf/xlink/B3
index 8cedf74cc4..af538ed415 100755
--- a/tests/caf/xlink/B3
+++ b/tests/caf/xlink/B3
@@ -9,8 +9,8 @@
 puts "caf004-B3"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Standard
-NewDocument Doc2 MDTV-Standard
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
@@ -55,7 +55,7 @@ CopyWithLink Doc1 ${aLabel2} Doc1 ${aLabel1}
 NewCommand Doc1
 
 # Save the document
-set aFile ${imagedir}/caf004-B3.std
+set aFile ${imagedir}/caf004-B3.cbf
 file delete ${aFile}
 SaveAs Doc1 ${aFile}
 if { ![file exists ${aFile}] } {
diff --git a/tests/caf/xlink/B4 b/tests/caf/xlink/B4
index 268b683bad..e1af51933c 100755
--- a/tests/caf/xlink/B4
+++ b/tests/caf/xlink/B4
@@ -9,8 +9,8 @@
 puts "caf004-B4"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/caf/xlink/B5 b/tests/caf/xlink/B5
index a57898ef42..e7cac99f41 100755
--- a/tests/caf/xlink/B5
+++ b/tests/caf/xlink/B5
@@ -9,8 +9,8 @@
 puts "caf004-CIN001_b5.rle"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/caf/xlink/C1 b/tests/caf/xlink/C1
index cb46d05ccf..2273c11d95 100755
--- a/tests/caf/xlink/C1
+++ b/tests/caf/xlink/C1
@@ -9,8 +9,8 @@
 puts "caf004-C1"
 
 # 1. Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # 2. Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/caf/xlink/D1 b/tests/caf/xlink/D1
index 7b83ed3f89..04a15b153c 100755
--- a/tests/caf/xlink/D1
+++ b/tests/caf/xlink/D1
@@ -9,8 +9,8 @@
 puts "caf004-D1"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/caf/xlink/D2 b/tests/caf/xlink/D2
index 378e1fd53f..486b4ed988 100755
--- a/tests/caf/xlink/D2
+++ b/tests/caf/xlink/D2
@@ -9,8 +9,8 @@
 puts "caf004-D2"
 
 # Create two new documents Doc1, Doc2
-NewDocument Doc1 MDTV-Design
-NewDocument Doc2 MDTV-Design
+NewDocument Doc1 BinOcaf
+NewDocument Doc2 BinOcaf
 
 # Set UndoLimit for them
 UndoLimit Doc1 100
diff --git a/tests/de/begin b/tests/de/begin
index b363dda704..20204e3741 100644
--- a/tests/de/begin
+++ b/tests/de/begin
@@ -5,7 +5,7 @@ pload XDE
 cpulimit 2500
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-XCAF
+NewDocument D BinXCAF
 UndoLimit D 100
 
 # Open a transaction
diff --git a/tests/v3d/glsl/distinguish_off b/tests/v3d/glsl/distinguish_off
index b8aa39aeff..75e94b1e15 100644
--- a/tests/v3d/glsl/distinguish_off
+++ b/tests/v3d/glsl/distinguish_off
@@ -7,7 +7,7 @@ box b 10 10 10
 vclear
 vclose all
 catch { Close D }
-NewDocument D MDTV-XCAF
+NewDocument D BinXCAF
 XAddShape D b
 XSetColor D b 0 0 1
 explode b f
diff --git a/tests/xcaf/brep_to_dxc/A1 b/tests/xcaf/brep_to_xbf/A1
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A1
rename to tests/xcaf/brep_to_xbf/A1
diff --git a/tests/xcaf/brep_to_dxc/A2 b/tests/xcaf/brep_to_xbf/A2
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A2
rename to tests/xcaf/brep_to_xbf/A2
diff --git a/tests/xcaf/brep_to_dxc/A3 b/tests/xcaf/brep_to_xbf/A3
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A3
rename to tests/xcaf/brep_to_xbf/A3
diff --git a/tests/xcaf/brep_to_dxc/A4 b/tests/xcaf/brep_to_xbf/A4
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A4
rename to tests/xcaf/brep_to_xbf/A4
diff --git a/tests/xcaf/brep_to_dxc/A5 b/tests/xcaf/brep_to_xbf/A5
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A5
rename to tests/xcaf/brep_to_xbf/A5
diff --git a/tests/xcaf/brep_to_dxc/A6 b/tests/xcaf/brep_to_xbf/A6
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A6
rename to tests/xcaf/brep_to_xbf/A6
diff --git a/tests/xcaf/brep_to_dxc/A7 b/tests/xcaf/brep_to_xbf/A7
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A7
rename to tests/xcaf/brep_to_xbf/A7
diff --git a/tests/xcaf/brep_to_dxc/A8 b/tests/xcaf/brep_to_xbf/A8
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A8
rename to tests/xcaf/brep_to_xbf/A8
diff --git a/tests/xcaf/brep_to_dxc/A9 b/tests/xcaf/brep_to_xbf/A9
similarity index 100%
rename from tests/xcaf/brep_to_dxc/A9
rename to tests/xcaf/brep_to_xbf/A9
diff --git a/tests/xcaf/brep_to_dxc/B1 b/tests/xcaf/brep_to_xbf/B1
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B1
rename to tests/xcaf/brep_to_xbf/B1
diff --git a/tests/xcaf/brep_to_dxc/B2 b/tests/xcaf/brep_to_xbf/B2
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B2
rename to tests/xcaf/brep_to_xbf/B2
diff --git a/tests/xcaf/brep_to_dxc/B3 b/tests/xcaf/brep_to_xbf/B3
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B3
rename to tests/xcaf/brep_to_xbf/B3
diff --git a/tests/xcaf/brep_to_dxc/B4 b/tests/xcaf/brep_to_xbf/B4
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B4
rename to tests/xcaf/brep_to_xbf/B4
diff --git a/tests/xcaf/brep_to_dxc/B5 b/tests/xcaf/brep_to_xbf/B5
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B5
rename to tests/xcaf/brep_to_xbf/B5
diff --git a/tests/xcaf/brep_to_dxc/B6 b/tests/xcaf/brep_to_xbf/B6
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B6
rename to tests/xcaf/brep_to_xbf/B6
diff --git a/tests/xcaf/brep_to_dxc/B7 b/tests/xcaf/brep_to_xbf/B7
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B7
rename to tests/xcaf/brep_to_xbf/B7
diff --git a/tests/xcaf/brep_to_dxc/B8 b/tests/xcaf/brep_to_xbf/B8
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B8
rename to tests/xcaf/brep_to_xbf/B8
diff --git a/tests/xcaf/brep_to_dxc/B9 b/tests/xcaf/brep_to_xbf/B9
similarity index 100%
rename from tests/xcaf/brep_to_dxc/B9
rename to tests/xcaf/brep_to_xbf/B9
diff --git a/tests/xcaf/brep_to_dxc/C1 b/tests/xcaf/brep_to_xbf/C1
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C1
rename to tests/xcaf/brep_to_xbf/C1
diff --git a/tests/xcaf/brep_to_dxc/C2 b/tests/xcaf/brep_to_xbf/C2
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C2
rename to tests/xcaf/brep_to_xbf/C2
diff --git a/tests/xcaf/brep_to_dxc/C3 b/tests/xcaf/brep_to_xbf/C3
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C3
rename to tests/xcaf/brep_to_xbf/C3
diff --git a/tests/xcaf/brep_to_dxc/C4 b/tests/xcaf/brep_to_xbf/C4
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C4
rename to tests/xcaf/brep_to_xbf/C4
diff --git a/tests/xcaf/brep_to_dxc/C5 b/tests/xcaf/brep_to_xbf/C5
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C5
rename to tests/xcaf/brep_to_xbf/C5
diff --git a/tests/xcaf/brep_to_dxc/C6 b/tests/xcaf/brep_to_xbf/C6
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C6
rename to tests/xcaf/brep_to_xbf/C6
diff --git a/tests/xcaf/brep_to_dxc/C7 b/tests/xcaf/brep_to_xbf/C7
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C7
rename to tests/xcaf/brep_to_xbf/C7
diff --git a/tests/xcaf/brep_to_dxc/C8 b/tests/xcaf/brep_to_xbf/C8
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C8
rename to tests/xcaf/brep_to_xbf/C8
diff --git a/tests/xcaf/brep_to_dxc/C9 b/tests/xcaf/brep_to_xbf/C9
similarity index 100%
rename from tests/xcaf/brep_to_dxc/C9
rename to tests/xcaf/brep_to_xbf/C9
diff --git a/tests/xcaf/brep_to_dxc/D1 b/tests/xcaf/brep_to_xbf/D1
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D1
rename to tests/xcaf/brep_to_xbf/D1
diff --git a/tests/xcaf/brep_to_dxc/D2 b/tests/xcaf/brep_to_xbf/D2
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D2
rename to tests/xcaf/brep_to_xbf/D2
diff --git a/tests/xcaf/brep_to_dxc/D3 b/tests/xcaf/brep_to_xbf/D3
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D3
rename to tests/xcaf/brep_to_xbf/D3
diff --git a/tests/xcaf/brep_to_dxc/D4 b/tests/xcaf/brep_to_xbf/D4
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D4
rename to tests/xcaf/brep_to_xbf/D4
diff --git a/tests/xcaf/brep_to_dxc/D5 b/tests/xcaf/brep_to_xbf/D5
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D5
rename to tests/xcaf/brep_to_xbf/D5
diff --git a/tests/xcaf/brep_to_dxc/D6 b/tests/xcaf/brep_to_xbf/D6
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D6
rename to tests/xcaf/brep_to_xbf/D6
diff --git a/tests/xcaf/brep_to_dxc/D7 b/tests/xcaf/brep_to_xbf/D7
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D7
rename to tests/xcaf/brep_to_xbf/D7
diff --git a/tests/xcaf/brep_to_dxc/D8 b/tests/xcaf/brep_to_xbf/D8
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D8
rename to tests/xcaf/brep_to_xbf/D8
diff --git a/tests/xcaf/brep_to_dxc/D9 b/tests/xcaf/brep_to_xbf/D9
similarity index 100%
rename from tests/xcaf/brep_to_dxc/D9
rename to tests/xcaf/brep_to_xbf/D9
diff --git a/tests/xcaf/brep_to_dxc/E1 b/tests/xcaf/brep_to_xbf/E1
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E1
rename to tests/xcaf/brep_to_xbf/E1
diff --git a/tests/xcaf/brep_to_dxc/E2 b/tests/xcaf/brep_to_xbf/E2
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E2
rename to tests/xcaf/brep_to_xbf/E2
diff --git a/tests/xcaf/brep_to_dxc/E3 b/tests/xcaf/brep_to_xbf/E3
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E3
rename to tests/xcaf/brep_to_xbf/E3
diff --git a/tests/xcaf/brep_to_dxc/E4 b/tests/xcaf/brep_to_xbf/E4
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E4
rename to tests/xcaf/brep_to_xbf/E4
diff --git a/tests/xcaf/brep_to_dxc/E5 b/tests/xcaf/brep_to_xbf/E5
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E5
rename to tests/xcaf/brep_to_xbf/E5
diff --git a/tests/xcaf/brep_to_dxc/E6 b/tests/xcaf/brep_to_xbf/E6
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E6
rename to tests/xcaf/brep_to_xbf/E6
diff --git a/tests/xcaf/brep_to_dxc/E7 b/tests/xcaf/brep_to_xbf/E7
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E7
rename to tests/xcaf/brep_to_xbf/E7
diff --git a/tests/xcaf/brep_to_dxc/E8 b/tests/xcaf/brep_to_xbf/E8
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E8
rename to tests/xcaf/brep_to_xbf/E8
diff --git a/tests/xcaf/brep_to_dxc/E9 b/tests/xcaf/brep_to_xbf/E9
similarity index 100%
rename from tests/xcaf/brep_to_dxc/E9
rename to tests/xcaf/brep_to_xbf/E9
diff --git a/tests/xcaf/brep_to_dxc/F1 b/tests/xcaf/brep_to_xbf/F1
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F1
rename to tests/xcaf/brep_to_xbf/F1
diff --git a/tests/xcaf/brep_to_dxc/F2 b/tests/xcaf/brep_to_xbf/F2
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F2
rename to tests/xcaf/brep_to_xbf/F2
diff --git a/tests/xcaf/brep_to_dxc/F3 b/tests/xcaf/brep_to_xbf/F3
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F3
rename to tests/xcaf/brep_to_xbf/F3
diff --git a/tests/xcaf/brep_to_dxc/F4 b/tests/xcaf/brep_to_xbf/F4
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F4
rename to tests/xcaf/brep_to_xbf/F4
diff --git a/tests/xcaf/brep_to_dxc/F5 b/tests/xcaf/brep_to_xbf/F5
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F5
rename to tests/xcaf/brep_to_xbf/F5
diff --git a/tests/xcaf/brep_to_dxc/F6 b/tests/xcaf/brep_to_xbf/F6
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F6
rename to tests/xcaf/brep_to_xbf/F6
diff --git a/tests/xcaf/brep_to_dxc/F7 b/tests/xcaf/brep_to_xbf/F7
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F7
rename to tests/xcaf/brep_to_xbf/F7
diff --git a/tests/xcaf/brep_to_dxc/F8 b/tests/xcaf/brep_to_xbf/F8
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F8
rename to tests/xcaf/brep_to_xbf/F8
diff --git a/tests/xcaf/brep_to_dxc/F9 b/tests/xcaf/brep_to_xbf/F9
similarity index 100%
rename from tests/xcaf/brep_to_dxc/F9
rename to tests/xcaf/brep_to_xbf/F9
diff --git a/tests/xcaf/brep_to_dxc/G1 b/tests/xcaf/brep_to_xbf/G1
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G1
rename to tests/xcaf/brep_to_xbf/G1
diff --git a/tests/xcaf/brep_to_dxc/G2 b/tests/xcaf/brep_to_xbf/G2
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G2
rename to tests/xcaf/brep_to_xbf/G2
diff --git a/tests/xcaf/brep_to_dxc/G3 b/tests/xcaf/brep_to_xbf/G3
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G3
rename to tests/xcaf/brep_to_xbf/G3
diff --git a/tests/xcaf/brep_to_dxc/G4 b/tests/xcaf/brep_to_xbf/G4
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G4
rename to tests/xcaf/brep_to_xbf/G4
diff --git a/tests/xcaf/brep_to_dxc/G5 b/tests/xcaf/brep_to_xbf/G5
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G5
rename to tests/xcaf/brep_to_xbf/G5
diff --git a/tests/xcaf/brep_to_dxc/G6 b/tests/xcaf/brep_to_xbf/G6
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G6
rename to tests/xcaf/brep_to_xbf/G6
diff --git a/tests/xcaf/brep_to_dxc/G7 b/tests/xcaf/brep_to_xbf/G7
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G7
rename to tests/xcaf/brep_to_xbf/G7
diff --git a/tests/xcaf/brep_to_dxc/G8 b/tests/xcaf/brep_to_xbf/G8
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G8
rename to tests/xcaf/brep_to_xbf/G8
diff --git a/tests/xcaf/brep_to_dxc/G9 b/tests/xcaf/brep_to_xbf/G9
similarity index 100%
rename from tests/xcaf/brep_to_dxc/G9
rename to tests/xcaf/brep_to_xbf/G9
diff --git a/tests/xcaf/brep_to_dxc/I1 b/tests/xcaf/brep_to_xbf/I1
similarity index 100%
rename from tests/xcaf/brep_to_dxc/I1
rename to tests/xcaf/brep_to_xbf/I1
diff --git a/tests/xcaf/brep_to_dxc/I2 b/tests/xcaf/brep_to_xbf/I2
similarity index 100%
rename from tests/xcaf/brep_to_dxc/I2
rename to tests/xcaf/brep_to_xbf/I2
diff --git a/tests/xcaf/brep_to_dxc/I3 b/tests/xcaf/brep_to_xbf/I3
similarity index 100%
rename from tests/xcaf/brep_to_dxc/I3
rename to tests/xcaf/brep_to_xbf/I3
diff --git a/tests/xcaf/brep_to_dxc/I4 b/tests/xcaf/brep_to_xbf/I4
similarity index 100%
rename from tests/xcaf/brep_to_dxc/I4
rename to tests/xcaf/brep_to_xbf/I4
diff --git a/tests/xcaf/brep_to_dxc/I5 b/tests/xcaf/brep_to_xbf/I5
similarity index 100%
rename from tests/xcaf/brep_to_dxc/I5
rename to tests/xcaf/brep_to_xbf/I5
diff --git a/tests/xcaf/brep_to_dxc/I6 b/tests/xcaf/brep_to_xbf/I6
similarity index 100%
rename from tests/xcaf/brep_to_dxc/I6
rename to tests/xcaf/brep_to_xbf/I6
diff --git a/tests/xcaf/end b/tests/xcaf/end
index 78aebe90ae..b3d4f8a6f2 100644
--- a/tests/xcaf/end
+++ b/tests/xcaf/end
@@ -527,9 +527,9 @@ if { [regexp "LAYERS" $CompareDocumentsMode] || [regexp "ALL" $CompareDocumentsM
 ################## WRITING FILE ##################"
 ###Open temporary file
 if { [string compare ${TypeOfFile} ""] == 0  } {
-    set saving [SaveAs D_First $WorkDirectory/${casename}_D_First.dxc]
+    set saving [SaveAs D_First $WorkDirectory/${casename}_D_First.xbf]
     set closing [Close D_First]
-    set opening [Open $WorkDirectory/${casename}_D_First.dxc D_Second]
+    set opening [Open $WorkDirectory/${casename}_D_First.xbf D_Second]
 } elseif {[string compare ${TypeOfFile} "igs"] == 0 } {
     set writing [WriteIges D_First $WorkDirectory/${casename}_D_First.igs]
     set reading [ReadIges D_Second $WorkDirectory/${casename}_D_First.igs]
@@ -548,7 +548,7 @@ if { [string compare ${TypeOfFile} ""] == 0  } {
 }
 
 if { [string compare ${TypeOfFile} ""] == 0  } {
-    catch {[file delete $WorkDirectory/${casename}_D_First.dxc]}
+    catch {[file delete $WorkDirectory/${casename}_D_First.xbf]}
 } elseif {[string compare ${TypeOfFile} "igs"] == 0 } {
     catch {[file delete $WorkDirectory/${casename}_D_First.igs]}    
 } elseif {[string compare ${TypeOfFile} "stp"] == 0} {
diff --git a/tests/xcaf/grids.list b/tests/xcaf/grids.list
index 30c56aae60..e0cefc8d22 100644
--- a/tests/xcaf/grids.list
+++ b/tests/xcaf/grids.list
@@ -1,12 +1,12 @@
-001 dxc
-002 dxc_add_ACL
-003 dxc_add_CL
-004 igs_to_dxc
+001 xbf
+002 xbf_add_ACL
+003 xbf_add_CL
+004 igs_to_xbf
 005 igs_add_ACL
 006 brep_to_igs_add_CL
-007 stp_to_dxc
+007 stp_to_xbf
 008 stp_add_ACL
 009 brep_to_stp_add_CL
-010 brep_to_dxc
+010 brep_to_xbf
 011 add_ACL_brep
 012 brep_add_CL
\ No newline at end of file
diff --git a/tests/xcaf/igs_to_dxc/A1 b/tests/xcaf/igs_to_xbf/A1
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A1
rename to tests/xcaf/igs_to_xbf/A1
diff --git a/tests/xcaf/igs_to_dxc/A2 b/tests/xcaf/igs_to_xbf/A2
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A2
rename to tests/xcaf/igs_to_xbf/A2
diff --git a/tests/xcaf/igs_to_dxc/A3 b/tests/xcaf/igs_to_xbf/A3
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A3
rename to tests/xcaf/igs_to_xbf/A3
diff --git a/tests/xcaf/igs_to_dxc/A4 b/tests/xcaf/igs_to_xbf/A4
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A4
rename to tests/xcaf/igs_to_xbf/A4
diff --git a/tests/xcaf/igs_to_dxc/A5 b/tests/xcaf/igs_to_xbf/A5
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A5
rename to tests/xcaf/igs_to_xbf/A5
diff --git a/tests/xcaf/igs_to_dxc/A6 b/tests/xcaf/igs_to_xbf/A6
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A6
rename to tests/xcaf/igs_to_xbf/A6
diff --git a/tests/xcaf/igs_to_dxc/A7 b/tests/xcaf/igs_to_xbf/A7
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A7
rename to tests/xcaf/igs_to_xbf/A7
diff --git a/tests/xcaf/igs_to_dxc/A8 b/tests/xcaf/igs_to_xbf/A8
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A8
rename to tests/xcaf/igs_to_xbf/A8
diff --git a/tests/xcaf/igs_to_dxc/A9 b/tests/xcaf/igs_to_xbf/A9
similarity index 100%
rename from tests/xcaf/igs_to_dxc/A9
rename to tests/xcaf/igs_to_xbf/A9
diff --git a/tests/xcaf/igs_to_dxc/B1 b/tests/xcaf/igs_to_xbf/B1
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B1
rename to tests/xcaf/igs_to_xbf/B1
diff --git a/tests/xcaf/igs_to_dxc/B2 b/tests/xcaf/igs_to_xbf/B2
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B2
rename to tests/xcaf/igs_to_xbf/B2
diff --git a/tests/xcaf/igs_to_dxc/B3 b/tests/xcaf/igs_to_xbf/B3
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B3
rename to tests/xcaf/igs_to_xbf/B3
diff --git a/tests/xcaf/igs_to_dxc/B4 b/tests/xcaf/igs_to_xbf/B4
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B4
rename to tests/xcaf/igs_to_xbf/B4
diff --git a/tests/xcaf/igs_to_dxc/B5 b/tests/xcaf/igs_to_xbf/B5
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B5
rename to tests/xcaf/igs_to_xbf/B5
diff --git a/tests/xcaf/igs_to_dxc/B6 b/tests/xcaf/igs_to_xbf/B6
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B6
rename to tests/xcaf/igs_to_xbf/B6
diff --git a/tests/xcaf/igs_to_dxc/B7 b/tests/xcaf/igs_to_xbf/B7
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B7
rename to tests/xcaf/igs_to_xbf/B7
diff --git a/tests/xcaf/igs_to_dxc/B8 b/tests/xcaf/igs_to_xbf/B8
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B8
rename to tests/xcaf/igs_to_xbf/B8
diff --git a/tests/xcaf/igs_to_dxc/B9 b/tests/xcaf/igs_to_xbf/B9
similarity index 100%
rename from tests/xcaf/igs_to_dxc/B9
rename to tests/xcaf/igs_to_xbf/B9
diff --git a/tests/xcaf/igs_to_dxc/C1 b/tests/xcaf/igs_to_xbf/C1
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C1
rename to tests/xcaf/igs_to_xbf/C1
diff --git a/tests/xcaf/igs_to_dxc/C2 b/tests/xcaf/igs_to_xbf/C2
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C2
rename to tests/xcaf/igs_to_xbf/C2
diff --git a/tests/xcaf/igs_to_dxc/C3 b/tests/xcaf/igs_to_xbf/C3
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C3
rename to tests/xcaf/igs_to_xbf/C3
diff --git a/tests/xcaf/igs_to_dxc/C4 b/tests/xcaf/igs_to_xbf/C4
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C4
rename to tests/xcaf/igs_to_xbf/C4
diff --git a/tests/xcaf/igs_to_dxc/C5 b/tests/xcaf/igs_to_xbf/C5
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C5
rename to tests/xcaf/igs_to_xbf/C5
diff --git a/tests/xcaf/igs_to_dxc/C6 b/tests/xcaf/igs_to_xbf/C6
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C6
rename to tests/xcaf/igs_to_xbf/C6
diff --git a/tests/xcaf/igs_to_dxc/C7 b/tests/xcaf/igs_to_xbf/C7
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C7
rename to tests/xcaf/igs_to_xbf/C7
diff --git a/tests/xcaf/igs_to_dxc/C8 b/tests/xcaf/igs_to_xbf/C8
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C8
rename to tests/xcaf/igs_to_xbf/C8
diff --git a/tests/xcaf/igs_to_dxc/C9 b/tests/xcaf/igs_to_xbf/C9
similarity index 100%
rename from tests/xcaf/igs_to_dxc/C9
rename to tests/xcaf/igs_to_xbf/C9
diff --git a/tests/xcaf/igs_to_dxc/D1 b/tests/xcaf/igs_to_xbf/D1
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D1
rename to tests/xcaf/igs_to_xbf/D1
diff --git a/tests/xcaf/igs_to_dxc/D2 b/tests/xcaf/igs_to_xbf/D2
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D2
rename to tests/xcaf/igs_to_xbf/D2
diff --git a/tests/xcaf/igs_to_dxc/D3 b/tests/xcaf/igs_to_xbf/D3
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D3
rename to tests/xcaf/igs_to_xbf/D3
diff --git a/tests/xcaf/igs_to_dxc/D4 b/tests/xcaf/igs_to_xbf/D4
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D4
rename to tests/xcaf/igs_to_xbf/D4
diff --git a/tests/xcaf/igs_to_dxc/D5 b/tests/xcaf/igs_to_xbf/D5
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D5
rename to tests/xcaf/igs_to_xbf/D5
diff --git a/tests/xcaf/igs_to_dxc/D6 b/tests/xcaf/igs_to_xbf/D6
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D6
rename to tests/xcaf/igs_to_xbf/D6
diff --git a/tests/xcaf/igs_to_dxc/D7 b/tests/xcaf/igs_to_xbf/D7
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D7
rename to tests/xcaf/igs_to_xbf/D7
diff --git a/tests/xcaf/igs_to_dxc/D8 b/tests/xcaf/igs_to_xbf/D8
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D8
rename to tests/xcaf/igs_to_xbf/D8
diff --git a/tests/xcaf/igs_to_dxc/D9 b/tests/xcaf/igs_to_xbf/D9
similarity index 100%
rename from tests/xcaf/igs_to_dxc/D9
rename to tests/xcaf/igs_to_xbf/D9
diff --git a/tests/xcaf/igs_to_dxc/E1 b/tests/xcaf/igs_to_xbf/E1
similarity index 100%
rename from tests/xcaf/igs_to_dxc/E1
rename to tests/xcaf/igs_to_xbf/E1
diff --git a/tests/xcaf/igs_to_dxc/E2 b/tests/xcaf/igs_to_xbf/E2
similarity index 100%
rename from tests/xcaf/igs_to_dxc/E2
rename to tests/xcaf/igs_to_xbf/E2
diff --git a/tests/xcaf/igs_to_dxc/E3 b/tests/xcaf/igs_to_xbf/E3
similarity index 100%
rename from tests/xcaf/igs_to_dxc/E3
rename to tests/xcaf/igs_to_xbf/E3
diff --git a/tests/xcaf/igs_to_dxc/E4 b/tests/xcaf/igs_to_xbf/E4
similarity index 100%
rename from tests/xcaf/igs_to_dxc/E4
rename to tests/xcaf/igs_to_xbf/E4
diff --git a/tests/xcaf/igs_to_dxc/E5 b/tests/xcaf/igs_to_xbf/E5
similarity index 100%
rename from tests/xcaf/igs_to_dxc/E5
rename to tests/xcaf/igs_to_xbf/E5
diff --git a/tests/xcaf/igs_to_dxc/E6 b/tests/xcaf/igs_to_xbf/E6
similarity index 100%
rename from tests/xcaf/igs_to_dxc/E6
rename to tests/xcaf/igs_to_xbf/E6
diff --git a/tests/xcaf/igs_to_dxc/E7 b/tests/xcaf/igs_to_xbf/E7
similarity index 100%
rename from tests/xcaf/igs_to_dxc/E7
rename to tests/xcaf/igs_to_xbf/E7
diff --git a/tests/xcaf/stp_to_dxc/A1 b/tests/xcaf/stp_to_xbf/A1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A1
rename to tests/xcaf/stp_to_xbf/A1
diff --git a/tests/xcaf/stp_to_dxc/A2 b/tests/xcaf/stp_to_xbf/A2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A2
rename to tests/xcaf/stp_to_xbf/A2
diff --git a/tests/xcaf/stp_to_dxc/A3 b/tests/xcaf/stp_to_xbf/A3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A3
rename to tests/xcaf/stp_to_xbf/A3
diff --git a/tests/xcaf/stp_to_dxc/A4 b/tests/xcaf/stp_to_xbf/A4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A4
rename to tests/xcaf/stp_to_xbf/A4
diff --git a/tests/xcaf/stp_to_dxc/A5 b/tests/xcaf/stp_to_xbf/A5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A5
rename to tests/xcaf/stp_to_xbf/A5
diff --git a/tests/xcaf/stp_to_dxc/A6 b/tests/xcaf/stp_to_xbf/A6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A6
rename to tests/xcaf/stp_to_xbf/A6
diff --git a/tests/xcaf/stp_to_dxc/A7 b/tests/xcaf/stp_to_xbf/A7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A7
rename to tests/xcaf/stp_to_xbf/A7
diff --git a/tests/xcaf/stp_to_dxc/A8 b/tests/xcaf/stp_to_xbf/A8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A8
rename to tests/xcaf/stp_to_xbf/A8
diff --git a/tests/xcaf/stp_to_dxc/A9 b/tests/xcaf/stp_to_xbf/A9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/A9
rename to tests/xcaf/stp_to_xbf/A9
diff --git a/tests/xcaf/stp_to_dxc/B1 b/tests/xcaf/stp_to_xbf/B1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B1
rename to tests/xcaf/stp_to_xbf/B1
diff --git a/tests/xcaf/stp_to_dxc/B2 b/tests/xcaf/stp_to_xbf/B2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B2
rename to tests/xcaf/stp_to_xbf/B2
diff --git a/tests/xcaf/stp_to_dxc/B3 b/tests/xcaf/stp_to_xbf/B3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B3
rename to tests/xcaf/stp_to_xbf/B3
diff --git a/tests/xcaf/stp_to_dxc/B4 b/tests/xcaf/stp_to_xbf/B4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B4
rename to tests/xcaf/stp_to_xbf/B4
diff --git a/tests/xcaf/stp_to_dxc/B5 b/tests/xcaf/stp_to_xbf/B5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B5
rename to tests/xcaf/stp_to_xbf/B5
diff --git a/tests/xcaf/stp_to_dxc/B6 b/tests/xcaf/stp_to_xbf/B6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B6
rename to tests/xcaf/stp_to_xbf/B6
diff --git a/tests/xcaf/stp_to_dxc/B7 b/tests/xcaf/stp_to_xbf/B7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B7
rename to tests/xcaf/stp_to_xbf/B7
diff --git a/tests/xcaf/stp_to_dxc/B8 b/tests/xcaf/stp_to_xbf/B8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B8
rename to tests/xcaf/stp_to_xbf/B8
diff --git a/tests/xcaf/stp_to_dxc/B9 b/tests/xcaf/stp_to_xbf/B9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/B9
rename to tests/xcaf/stp_to_xbf/B9
diff --git a/tests/xcaf/stp_to_dxc/C1 b/tests/xcaf/stp_to_xbf/C1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C1
rename to tests/xcaf/stp_to_xbf/C1
diff --git a/tests/xcaf/stp_to_dxc/C2 b/tests/xcaf/stp_to_xbf/C2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C2
rename to tests/xcaf/stp_to_xbf/C2
diff --git a/tests/xcaf/stp_to_dxc/C3 b/tests/xcaf/stp_to_xbf/C3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C3
rename to tests/xcaf/stp_to_xbf/C3
diff --git a/tests/xcaf/stp_to_dxc/C4 b/tests/xcaf/stp_to_xbf/C4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C4
rename to tests/xcaf/stp_to_xbf/C4
diff --git a/tests/xcaf/stp_to_dxc/C5 b/tests/xcaf/stp_to_xbf/C5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C5
rename to tests/xcaf/stp_to_xbf/C5
diff --git a/tests/xcaf/stp_to_dxc/C6 b/tests/xcaf/stp_to_xbf/C6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C6
rename to tests/xcaf/stp_to_xbf/C6
diff --git a/tests/xcaf/stp_to_dxc/C7 b/tests/xcaf/stp_to_xbf/C7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C7
rename to tests/xcaf/stp_to_xbf/C7
diff --git a/tests/xcaf/stp_to_dxc/C8 b/tests/xcaf/stp_to_xbf/C8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C8
rename to tests/xcaf/stp_to_xbf/C8
diff --git a/tests/xcaf/stp_to_dxc/C9 b/tests/xcaf/stp_to_xbf/C9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/C9
rename to tests/xcaf/stp_to_xbf/C9
diff --git a/tests/xcaf/stp_to_dxc/D1 b/tests/xcaf/stp_to_xbf/D1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D1
rename to tests/xcaf/stp_to_xbf/D1
diff --git a/tests/xcaf/stp_to_dxc/D2 b/tests/xcaf/stp_to_xbf/D2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D2
rename to tests/xcaf/stp_to_xbf/D2
diff --git a/tests/xcaf/stp_to_dxc/D3 b/tests/xcaf/stp_to_xbf/D3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D3
rename to tests/xcaf/stp_to_xbf/D3
diff --git a/tests/xcaf/stp_to_dxc/D4 b/tests/xcaf/stp_to_xbf/D4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D4
rename to tests/xcaf/stp_to_xbf/D4
diff --git a/tests/xcaf/stp_to_dxc/D5 b/tests/xcaf/stp_to_xbf/D5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D5
rename to tests/xcaf/stp_to_xbf/D5
diff --git a/tests/xcaf/stp_to_dxc/D6 b/tests/xcaf/stp_to_xbf/D6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D6
rename to tests/xcaf/stp_to_xbf/D6
diff --git a/tests/xcaf/stp_to_dxc/D7 b/tests/xcaf/stp_to_xbf/D7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D7
rename to tests/xcaf/stp_to_xbf/D7
diff --git a/tests/xcaf/stp_to_dxc/D8 b/tests/xcaf/stp_to_xbf/D8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D8
rename to tests/xcaf/stp_to_xbf/D8
diff --git a/tests/xcaf/stp_to_dxc/D9 b/tests/xcaf/stp_to_xbf/D9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/D9
rename to tests/xcaf/stp_to_xbf/D9
diff --git a/tests/xcaf/stp_to_dxc/E1 b/tests/xcaf/stp_to_xbf/E1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E1
rename to tests/xcaf/stp_to_xbf/E1
diff --git a/tests/xcaf/stp_to_dxc/E2 b/tests/xcaf/stp_to_xbf/E2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E2
rename to tests/xcaf/stp_to_xbf/E2
diff --git a/tests/xcaf/stp_to_dxc/E3 b/tests/xcaf/stp_to_xbf/E3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E3
rename to tests/xcaf/stp_to_xbf/E3
diff --git a/tests/xcaf/stp_to_dxc/E4 b/tests/xcaf/stp_to_xbf/E4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E4
rename to tests/xcaf/stp_to_xbf/E4
diff --git a/tests/xcaf/stp_to_dxc/E5 b/tests/xcaf/stp_to_xbf/E5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E5
rename to tests/xcaf/stp_to_xbf/E5
diff --git a/tests/xcaf/stp_to_dxc/E6 b/tests/xcaf/stp_to_xbf/E6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E6
rename to tests/xcaf/stp_to_xbf/E6
diff --git a/tests/xcaf/stp_to_dxc/E7 b/tests/xcaf/stp_to_xbf/E7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E7
rename to tests/xcaf/stp_to_xbf/E7
diff --git a/tests/xcaf/stp_to_dxc/E8 b/tests/xcaf/stp_to_xbf/E8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E8
rename to tests/xcaf/stp_to_xbf/E8
diff --git a/tests/xcaf/stp_to_dxc/E9 b/tests/xcaf/stp_to_xbf/E9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/E9
rename to tests/xcaf/stp_to_xbf/E9
diff --git a/tests/xcaf/stp_to_dxc/F1 b/tests/xcaf/stp_to_xbf/F1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F1
rename to tests/xcaf/stp_to_xbf/F1
diff --git a/tests/xcaf/stp_to_dxc/F2 b/tests/xcaf/stp_to_xbf/F2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F2
rename to tests/xcaf/stp_to_xbf/F2
diff --git a/tests/xcaf/stp_to_dxc/F3 b/tests/xcaf/stp_to_xbf/F3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F3
rename to tests/xcaf/stp_to_xbf/F3
diff --git a/tests/xcaf/stp_to_dxc/F4 b/tests/xcaf/stp_to_xbf/F4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F4
rename to tests/xcaf/stp_to_xbf/F4
diff --git a/tests/xcaf/stp_to_dxc/F5 b/tests/xcaf/stp_to_xbf/F5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F5
rename to tests/xcaf/stp_to_xbf/F5
diff --git a/tests/xcaf/stp_to_dxc/F6 b/tests/xcaf/stp_to_xbf/F6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F6
rename to tests/xcaf/stp_to_xbf/F6
diff --git a/tests/xcaf/stp_to_dxc/F7 b/tests/xcaf/stp_to_xbf/F7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F7
rename to tests/xcaf/stp_to_xbf/F7
diff --git a/tests/xcaf/stp_to_dxc/F8 b/tests/xcaf/stp_to_xbf/F8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F8
rename to tests/xcaf/stp_to_xbf/F8
diff --git a/tests/xcaf/stp_to_dxc/F9 b/tests/xcaf/stp_to_xbf/F9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/F9
rename to tests/xcaf/stp_to_xbf/F9
diff --git a/tests/xcaf/stp_to_dxc/G1 b/tests/xcaf/stp_to_xbf/G1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G1
rename to tests/xcaf/stp_to_xbf/G1
diff --git a/tests/xcaf/stp_to_dxc/G2 b/tests/xcaf/stp_to_xbf/G2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G2
rename to tests/xcaf/stp_to_xbf/G2
diff --git a/tests/xcaf/stp_to_dxc/G3 b/tests/xcaf/stp_to_xbf/G3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G3
rename to tests/xcaf/stp_to_xbf/G3
diff --git a/tests/xcaf/stp_to_dxc/G4 b/tests/xcaf/stp_to_xbf/G4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G4
rename to tests/xcaf/stp_to_xbf/G4
diff --git a/tests/xcaf/stp_to_dxc/G5 b/tests/xcaf/stp_to_xbf/G5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G5
rename to tests/xcaf/stp_to_xbf/G5
diff --git a/tests/xcaf/stp_to_dxc/G6 b/tests/xcaf/stp_to_xbf/G6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G6
rename to tests/xcaf/stp_to_xbf/G6
diff --git a/tests/xcaf/stp_to_dxc/G7 b/tests/xcaf/stp_to_xbf/G7
old mode 100755
new mode 100644
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G7
rename to tests/xcaf/stp_to_xbf/G7
diff --git a/tests/xcaf/stp_to_dxc/G8 b/tests/xcaf/stp_to_xbf/G8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G8
rename to tests/xcaf/stp_to_xbf/G8
diff --git a/tests/xcaf/stp_to_dxc/G9 b/tests/xcaf/stp_to_xbf/G9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/G9
rename to tests/xcaf/stp_to_xbf/G9
diff --git a/tests/xcaf/stp_to_dxc/I1 b/tests/xcaf/stp_to_xbf/I1
old mode 100755
new mode 100644
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I1
rename to tests/xcaf/stp_to_xbf/I1
diff --git a/tests/xcaf/stp_to_dxc/I2 b/tests/xcaf/stp_to_xbf/I2
old mode 100755
new mode 100644
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I2
rename to tests/xcaf/stp_to_xbf/I2
diff --git a/tests/xcaf/stp_to_dxc/I3 b/tests/xcaf/stp_to_xbf/I3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I3
rename to tests/xcaf/stp_to_xbf/I3
diff --git a/tests/xcaf/stp_to_dxc/I4 b/tests/xcaf/stp_to_xbf/I4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I4
rename to tests/xcaf/stp_to_xbf/I4
diff --git a/tests/xcaf/stp_to_dxc/I5 b/tests/xcaf/stp_to_xbf/I5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I5
rename to tests/xcaf/stp_to_xbf/I5
diff --git a/tests/xcaf/stp_to_dxc/I6 b/tests/xcaf/stp_to_xbf/I6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I6
rename to tests/xcaf/stp_to_xbf/I6
diff --git a/tests/xcaf/stp_to_dxc/I7 b/tests/xcaf/stp_to_xbf/I7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I7
rename to tests/xcaf/stp_to_xbf/I7
diff --git a/tests/xcaf/stp_to_dxc/I8 b/tests/xcaf/stp_to_xbf/I8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I8
rename to tests/xcaf/stp_to_xbf/I8
diff --git a/tests/xcaf/stp_to_dxc/I9 b/tests/xcaf/stp_to_xbf/I9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/I9
rename to tests/xcaf/stp_to_xbf/I9
diff --git a/tests/xcaf/stp_to_dxc/J1 b/tests/xcaf/stp_to_xbf/J1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J1
rename to tests/xcaf/stp_to_xbf/J1
diff --git a/tests/xcaf/stp_to_dxc/J2 b/tests/xcaf/stp_to_xbf/J2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J2
rename to tests/xcaf/stp_to_xbf/J2
diff --git a/tests/xcaf/stp_to_dxc/J3 b/tests/xcaf/stp_to_xbf/J3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J3
rename to tests/xcaf/stp_to_xbf/J3
diff --git a/tests/xcaf/stp_to_dxc/J4 b/tests/xcaf/stp_to_xbf/J4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J4
rename to tests/xcaf/stp_to_xbf/J4
diff --git a/tests/xcaf/stp_to_dxc/J5 b/tests/xcaf/stp_to_xbf/J5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J5
rename to tests/xcaf/stp_to_xbf/J5
diff --git a/tests/xcaf/stp_to_dxc/J6 b/tests/xcaf/stp_to_xbf/J6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J6
rename to tests/xcaf/stp_to_xbf/J6
diff --git a/tests/xcaf/stp_to_dxc/J7 b/tests/xcaf/stp_to_xbf/J7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J7
rename to tests/xcaf/stp_to_xbf/J7
diff --git a/tests/xcaf/stp_to_dxc/J8 b/tests/xcaf/stp_to_xbf/J8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J8
rename to tests/xcaf/stp_to_xbf/J8
diff --git a/tests/xcaf/stp_to_dxc/J9 b/tests/xcaf/stp_to_xbf/J9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/J9
rename to tests/xcaf/stp_to_xbf/J9
diff --git a/tests/xcaf/stp_to_dxc/K1 b/tests/xcaf/stp_to_xbf/K1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K1
rename to tests/xcaf/stp_to_xbf/K1
diff --git a/tests/xcaf/stp_to_dxc/K2 b/tests/xcaf/stp_to_xbf/K2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K2
rename to tests/xcaf/stp_to_xbf/K2
diff --git a/tests/xcaf/stp_to_dxc/K3 b/tests/xcaf/stp_to_xbf/K3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K3
rename to tests/xcaf/stp_to_xbf/K3
diff --git a/tests/xcaf/stp_to_dxc/K4 b/tests/xcaf/stp_to_xbf/K4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K4
rename to tests/xcaf/stp_to_xbf/K4
diff --git a/tests/xcaf/stp_to_dxc/K5 b/tests/xcaf/stp_to_xbf/K5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K5
rename to tests/xcaf/stp_to_xbf/K5
diff --git a/tests/xcaf/stp_to_dxc/K6 b/tests/xcaf/stp_to_xbf/K6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K6
rename to tests/xcaf/stp_to_xbf/K6
diff --git a/tests/xcaf/stp_to_dxc/K7 b/tests/xcaf/stp_to_xbf/K7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K7
rename to tests/xcaf/stp_to_xbf/K7
diff --git a/tests/xcaf/stp_to_dxc/K8 b/tests/xcaf/stp_to_xbf/K8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K8
rename to tests/xcaf/stp_to_xbf/K8
diff --git a/tests/xcaf/stp_to_dxc/K9 b/tests/xcaf/stp_to_xbf/K9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/K9
rename to tests/xcaf/stp_to_xbf/K9
diff --git a/tests/xcaf/stp_to_dxc/L1 b/tests/xcaf/stp_to_xbf/L1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L1
rename to tests/xcaf/stp_to_xbf/L1
diff --git a/tests/xcaf/stp_to_dxc/L2 b/tests/xcaf/stp_to_xbf/L2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L2
rename to tests/xcaf/stp_to_xbf/L2
diff --git a/tests/xcaf/stp_to_dxc/L3 b/tests/xcaf/stp_to_xbf/L3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L3
rename to tests/xcaf/stp_to_xbf/L3
diff --git a/tests/xcaf/stp_to_dxc/L4 b/tests/xcaf/stp_to_xbf/L4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L4
rename to tests/xcaf/stp_to_xbf/L4
diff --git a/tests/xcaf/stp_to_dxc/L5 b/tests/xcaf/stp_to_xbf/L5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L5
rename to tests/xcaf/stp_to_xbf/L5
diff --git a/tests/xcaf/stp_to_dxc/L6 b/tests/xcaf/stp_to_xbf/L6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L6
rename to tests/xcaf/stp_to_xbf/L6
diff --git a/tests/xcaf/stp_to_dxc/L7 b/tests/xcaf/stp_to_xbf/L7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L7
rename to tests/xcaf/stp_to_xbf/L7
diff --git a/tests/xcaf/stp_to_dxc/L8 b/tests/xcaf/stp_to_xbf/L8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L8
rename to tests/xcaf/stp_to_xbf/L8
diff --git a/tests/xcaf/stp_to_dxc/L9 b/tests/xcaf/stp_to_xbf/L9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/L9
rename to tests/xcaf/stp_to_xbf/L9
diff --git a/tests/xcaf/stp_to_dxc/M1 b/tests/xcaf/stp_to_xbf/M1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M1
rename to tests/xcaf/stp_to_xbf/M1
diff --git a/tests/xcaf/stp_to_dxc/M2 b/tests/xcaf/stp_to_xbf/M2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M2
rename to tests/xcaf/stp_to_xbf/M2
diff --git a/tests/xcaf/stp_to_dxc/M3 b/tests/xcaf/stp_to_xbf/M3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M3
rename to tests/xcaf/stp_to_xbf/M3
diff --git a/tests/xcaf/stp_to_dxc/M4 b/tests/xcaf/stp_to_xbf/M4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M4
rename to tests/xcaf/stp_to_xbf/M4
diff --git a/tests/xcaf/stp_to_dxc/M5 b/tests/xcaf/stp_to_xbf/M5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M5
rename to tests/xcaf/stp_to_xbf/M5
diff --git a/tests/xcaf/stp_to_dxc/M6 b/tests/xcaf/stp_to_xbf/M6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M6
rename to tests/xcaf/stp_to_xbf/M6
diff --git a/tests/xcaf/stp_to_dxc/M7 b/tests/xcaf/stp_to_xbf/M7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M7
rename to tests/xcaf/stp_to_xbf/M7
diff --git a/tests/xcaf/stp_to_dxc/M8 b/tests/xcaf/stp_to_xbf/M8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M8
rename to tests/xcaf/stp_to_xbf/M8
diff --git a/tests/xcaf/stp_to_dxc/M9 b/tests/xcaf/stp_to_xbf/M9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/M9
rename to tests/xcaf/stp_to_xbf/M9
diff --git a/tests/xcaf/stp_to_dxc/N1 b/tests/xcaf/stp_to_xbf/N1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N1
rename to tests/xcaf/stp_to_xbf/N1
diff --git a/tests/xcaf/stp_to_dxc/N2 b/tests/xcaf/stp_to_xbf/N2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N2
rename to tests/xcaf/stp_to_xbf/N2
diff --git a/tests/xcaf/stp_to_dxc/N3 b/tests/xcaf/stp_to_xbf/N3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N3
rename to tests/xcaf/stp_to_xbf/N3
diff --git a/tests/xcaf/stp_to_dxc/N4 b/tests/xcaf/stp_to_xbf/N4
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N4
rename to tests/xcaf/stp_to_xbf/N4
diff --git a/tests/xcaf/stp_to_dxc/N5 b/tests/xcaf/stp_to_xbf/N5
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N5
rename to tests/xcaf/stp_to_xbf/N5
diff --git a/tests/xcaf/stp_to_dxc/N6 b/tests/xcaf/stp_to_xbf/N6
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N6
rename to tests/xcaf/stp_to_xbf/N6
diff --git a/tests/xcaf/stp_to_dxc/N7 b/tests/xcaf/stp_to_xbf/N7
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N7
rename to tests/xcaf/stp_to_xbf/N7
diff --git a/tests/xcaf/stp_to_dxc/N8 b/tests/xcaf/stp_to_xbf/N8
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N8
rename to tests/xcaf/stp_to_xbf/N8
diff --git a/tests/xcaf/stp_to_dxc/N9 b/tests/xcaf/stp_to_xbf/N9
similarity index 100%
rename from tests/xcaf/stp_to_dxc/N9
rename to tests/xcaf/stp_to_xbf/N9
diff --git a/tests/xcaf/stp_to_dxc/O1 b/tests/xcaf/stp_to_xbf/O1
similarity index 100%
rename from tests/xcaf/stp_to_dxc/O1
rename to tests/xcaf/stp_to_xbf/O1
diff --git a/tests/xcaf/stp_to_dxc/O2 b/tests/xcaf/stp_to_xbf/O2
similarity index 100%
rename from tests/xcaf/stp_to_dxc/O2
rename to tests/xcaf/stp_to_xbf/O2
diff --git a/tests/xcaf/stp_to_dxc/O3 b/tests/xcaf/stp_to_xbf/O3
similarity index 100%
rename from tests/xcaf/stp_to_dxc/O3
rename to tests/xcaf/stp_to_xbf/O3
diff --git a/tests/xcaf/dxc/A1 b/tests/xcaf/xbf/A1
similarity index 100%
rename from tests/xcaf/dxc/A1
rename to tests/xcaf/xbf/A1
diff --git a/tests/xcaf/dxc_add_ACL/A1 b/tests/xcaf/xbf_add_ACL/A1
similarity index 100%
rename from tests/xcaf/dxc_add_ACL/A1
rename to tests/xcaf/xbf_add_ACL/A1
diff --git a/tests/xcaf/dxc_add_CL/A1 b/tests/xcaf/xbf_add_CL/A1
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A1
rename to tests/xcaf/xbf_add_CL/A1
diff --git a/tests/xcaf/dxc_add_CL/A2 b/tests/xcaf/xbf_add_CL/A2
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A2
rename to tests/xcaf/xbf_add_CL/A2
diff --git a/tests/xcaf/dxc_add_CL/A3 b/tests/xcaf/xbf_add_CL/A3
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A3
rename to tests/xcaf/xbf_add_CL/A3
diff --git a/tests/xcaf/dxc_add_CL/A4 b/tests/xcaf/xbf_add_CL/A4
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A4
rename to tests/xcaf/xbf_add_CL/A4
diff --git a/tests/xcaf/dxc_add_CL/A5 b/tests/xcaf/xbf_add_CL/A5
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A5
rename to tests/xcaf/xbf_add_CL/A5
diff --git a/tests/xcaf/dxc_add_CL/A6 b/tests/xcaf/xbf_add_CL/A6
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A6
rename to tests/xcaf/xbf_add_CL/A6
diff --git a/tests/xcaf/dxc_add_CL/A7 b/tests/xcaf/xbf_add_CL/A7
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A7
rename to tests/xcaf/xbf_add_CL/A7
diff --git a/tests/xcaf/dxc_add_CL/A8 b/tests/xcaf/xbf_add_CL/A8
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A8
rename to tests/xcaf/xbf_add_CL/A8
diff --git a/tests/xcaf/dxc_add_CL/A9 b/tests/xcaf/xbf_add_CL/A9
similarity index 100%
rename from tests/xcaf/dxc_add_CL/A9
rename to tests/xcaf/xbf_add_CL/A9
diff --git a/tests/xcaf/dxc_add_CL/B1 b/tests/xcaf/xbf_add_CL/B1
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B1
rename to tests/xcaf/xbf_add_CL/B1
diff --git a/tests/xcaf/dxc_add_CL/B2 b/tests/xcaf/xbf_add_CL/B2
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B2
rename to tests/xcaf/xbf_add_CL/B2
diff --git a/tests/xcaf/dxc_add_CL/B3 b/tests/xcaf/xbf_add_CL/B3
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B3
rename to tests/xcaf/xbf_add_CL/B3
diff --git a/tests/xcaf/dxc_add_CL/B4 b/tests/xcaf/xbf_add_CL/B4
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B4
rename to tests/xcaf/xbf_add_CL/B4
diff --git a/tests/xcaf/dxc_add_CL/B5 b/tests/xcaf/xbf_add_CL/B5
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B5
rename to tests/xcaf/xbf_add_CL/B5
diff --git a/tests/xcaf/dxc_add_CL/B6 b/tests/xcaf/xbf_add_CL/B6
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B6
rename to tests/xcaf/xbf_add_CL/B6
diff --git a/tests/xcaf/dxc_add_CL/B7 b/tests/xcaf/xbf_add_CL/B7
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B7
rename to tests/xcaf/xbf_add_CL/B7
diff --git a/tests/xcaf/dxc_add_CL/B8 b/tests/xcaf/xbf_add_CL/B8
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B8
rename to tests/xcaf/xbf_add_CL/B8
diff --git a/tests/xcaf/dxc_add_CL/B9 b/tests/xcaf/xbf_add_CL/B9
similarity index 100%
rename from tests/xcaf/dxc_add_CL/B9
rename to tests/xcaf/xbf_add_CL/B9
diff --git a/tests/xcaf/dxc_add_CL/C1 b/tests/xcaf/xbf_add_CL/C1
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C1
rename to tests/xcaf/xbf_add_CL/C1
diff --git a/tests/xcaf/dxc_add_CL/C2 b/tests/xcaf/xbf_add_CL/C2
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C2
rename to tests/xcaf/xbf_add_CL/C2
diff --git a/tests/xcaf/dxc_add_CL/C3 b/tests/xcaf/xbf_add_CL/C3
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C3
rename to tests/xcaf/xbf_add_CL/C3
diff --git a/tests/xcaf/dxc_add_CL/C4 b/tests/xcaf/xbf_add_CL/C4
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C4
rename to tests/xcaf/xbf_add_CL/C4
diff --git a/tests/xcaf/dxc_add_CL/C5 b/tests/xcaf/xbf_add_CL/C5
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C5
rename to tests/xcaf/xbf_add_CL/C5
diff --git a/tests/xcaf/dxc_add_CL/C6 b/tests/xcaf/xbf_add_CL/C6
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C6
rename to tests/xcaf/xbf_add_CL/C6
diff --git a/tests/xcaf/dxc_add_CL/C7 b/tests/xcaf/xbf_add_CL/C7
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C7
rename to tests/xcaf/xbf_add_CL/C7
diff --git a/tests/xcaf/dxc_add_CL/C8 b/tests/xcaf/xbf_add_CL/C8
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C8
rename to tests/xcaf/xbf_add_CL/C8
diff --git a/tests/xcaf/dxc_add_CL/C9 b/tests/xcaf/xbf_add_CL/C9
similarity index 100%
rename from tests/xcaf/dxc_add_CL/C9
rename to tests/xcaf/xbf_add_CL/C9
diff --git a/tests/xcaf/dxc_add_CL/D1 b/tests/xcaf/xbf_add_CL/D1
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D1
rename to tests/xcaf/xbf_add_CL/D1
diff --git a/tests/xcaf/dxc_add_CL/D2 b/tests/xcaf/xbf_add_CL/D2
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D2
rename to tests/xcaf/xbf_add_CL/D2
diff --git a/tests/xcaf/dxc_add_CL/D3 b/tests/xcaf/xbf_add_CL/D3
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D3
rename to tests/xcaf/xbf_add_CL/D3
diff --git a/tests/xcaf/dxc_add_CL/D4 b/tests/xcaf/xbf_add_CL/D4
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D4
rename to tests/xcaf/xbf_add_CL/D4
diff --git a/tests/xcaf/dxc_add_CL/D5 b/tests/xcaf/xbf_add_CL/D5
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D5
rename to tests/xcaf/xbf_add_CL/D5
diff --git a/tests/xcaf/dxc_add_CL/D6 b/tests/xcaf/xbf_add_CL/D6
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D6
rename to tests/xcaf/xbf_add_CL/D6
diff --git a/tests/xcaf/dxc_add_CL/D7 b/tests/xcaf/xbf_add_CL/D7
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D7
rename to tests/xcaf/xbf_add_CL/D7
diff --git a/tests/xcaf/dxc_add_CL/D8 b/tests/xcaf/xbf_add_CL/D8
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D8
rename to tests/xcaf/xbf_add_CL/D8
diff --git a/tests/xcaf/dxc_add_CL/D9 b/tests/xcaf/xbf_add_CL/D9
similarity index 100%
rename from tests/xcaf/dxc_add_CL/D9
rename to tests/xcaf/xbf_add_CL/D9
diff --git a/tests/xcaf/dxc_add_CL/E1 b/tests/xcaf/xbf_add_CL/E1
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E1
rename to tests/xcaf/xbf_add_CL/E1
diff --git a/tests/xcaf/dxc_add_CL/E2 b/tests/xcaf/xbf_add_CL/E2
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E2
rename to tests/xcaf/xbf_add_CL/E2
diff --git a/tests/xcaf/dxc_add_CL/E3 b/tests/xcaf/xbf_add_CL/E3
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E3
rename to tests/xcaf/xbf_add_CL/E3
diff --git a/tests/xcaf/dxc_add_CL/E4 b/tests/xcaf/xbf_add_CL/E4
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E4
rename to tests/xcaf/xbf_add_CL/E4
diff --git a/tests/xcaf/dxc_add_CL/E5 b/tests/xcaf/xbf_add_CL/E5
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E5
rename to tests/xcaf/xbf_add_CL/E5
diff --git a/tests/xcaf/dxc_add_CL/E6 b/tests/xcaf/xbf_add_CL/E6
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E6
rename to tests/xcaf/xbf_add_CL/E6
diff --git a/tests/xcaf/dxc_add_CL/E7 b/tests/xcaf/xbf_add_CL/E7
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E7
rename to tests/xcaf/xbf_add_CL/E7
diff --git a/tests/xcaf/dxc_add_CL/E8 b/tests/xcaf/xbf_add_CL/E8
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E8
rename to tests/xcaf/xbf_add_CL/E8
diff --git a/tests/xcaf/dxc_add_CL/E9 b/tests/xcaf/xbf_add_CL/E9
similarity index 100%
rename from tests/xcaf/dxc_add_CL/E9
rename to tests/xcaf/xbf_add_CL/E9
diff --git a/tests/xcaf/dxc_add_CL/F1 b/tests/xcaf/xbf_add_CL/F1
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F1
rename to tests/xcaf/xbf_add_CL/F1
diff --git a/tests/xcaf/dxc_add_CL/F2 b/tests/xcaf/xbf_add_CL/F2
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F2
rename to tests/xcaf/xbf_add_CL/F2
diff --git a/tests/xcaf/dxc_add_CL/F3 b/tests/xcaf/xbf_add_CL/F3
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F3
rename to tests/xcaf/xbf_add_CL/F3
diff --git a/tests/xcaf/dxc_add_CL/F4 b/tests/xcaf/xbf_add_CL/F4
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F4
rename to tests/xcaf/xbf_add_CL/F4
diff --git a/tests/xcaf/dxc_add_CL/F5 b/tests/xcaf/xbf_add_CL/F5
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F5
rename to tests/xcaf/xbf_add_CL/F5
diff --git a/tests/xcaf/dxc_add_CL/F6 b/tests/xcaf/xbf_add_CL/F6
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F6
rename to tests/xcaf/xbf_add_CL/F6
diff --git a/tests/xcaf/dxc_add_CL/F7 b/tests/xcaf/xbf_add_CL/F7
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F7
rename to tests/xcaf/xbf_add_CL/F7
diff --git a/tests/xcaf/dxc_add_CL/F8 b/tests/xcaf/xbf_add_CL/F8
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F8
rename to tests/xcaf/xbf_add_CL/F8
diff --git a/tests/xcaf/dxc_add_CL/F9 b/tests/xcaf/xbf_add_CL/F9
similarity index 100%
rename from tests/xcaf/dxc_add_CL/F9
rename to tests/xcaf/xbf_add_CL/F9
diff --git a/tests/xcaf/dxc_add_CL/G1 b/tests/xcaf/xbf_add_CL/G1
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G1
rename to tests/xcaf/xbf_add_CL/G1
diff --git a/tests/xcaf/dxc_add_CL/G2 b/tests/xcaf/xbf_add_CL/G2
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G2
rename to tests/xcaf/xbf_add_CL/G2
diff --git a/tests/xcaf/dxc_add_CL/G3 b/tests/xcaf/xbf_add_CL/G3
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G3
rename to tests/xcaf/xbf_add_CL/G3
diff --git a/tests/xcaf/dxc_add_CL/G4 b/tests/xcaf/xbf_add_CL/G4
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G4
rename to tests/xcaf/xbf_add_CL/G4
diff --git a/tests/xcaf/dxc_add_CL/G5 b/tests/xcaf/xbf_add_CL/G5
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G5
rename to tests/xcaf/xbf_add_CL/G5
diff --git a/tests/xcaf/dxc_add_CL/G6 b/tests/xcaf/xbf_add_CL/G6
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G6
rename to tests/xcaf/xbf_add_CL/G6
diff --git a/tests/xcaf/dxc_add_CL/G7 b/tests/xcaf/xbf_add_CL/G7
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G7
rename to tests/xcaf/xbf_add_CL/G7
diff --git a/tests/xcaf/dxc_add_CL/G8 b/tests/xcaf/xbf_add_CL/G8
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G8
rename to tests/xcaf/xbf_add_CL/G8
diff --git a/tests/xcaf/dxc_add_CL/G9 b/tests/xcaf/xbf_add_CL/G9
similarity index 100%
rename from tests/xcaf/dxc_add_CL/G9
rename to tests/xcaf/xbf_add_CL/G9
diff --git a/tests/xcaf/dxc_add_CL/I1 b/tests/xcaf/xbf_add_CL/I1
similarity index 100%
rename from tests/xcaf/dxc_add_CL/I1
rename to tests/xcaf/xbf_add_CL/I1
diff --git a/tests/xcaf/dxc_add_CL/I2 b/tests/xcaf/xbf_add_CL/I2
similarity index 100%
rename from tests/xcaf/dxc_add_CL/I2
rename to tests/xcaf/xbf_add_CL/I2
diff --git a/tests/xcaf/dxc_add_CL/I3 b/tests/xcaf/xbf_add_CL/I3
similarity index 100%
rename from tests/xcaf/dxc_add_CL/I3
rename to tests/xcaf/xbf_add_CL/I3
diff --git a/tests/xcaf/dxc_add_CL/I4 b/tests/xcaf/xbf_add_CL/I4
similarity index 100%
rename from tests/xcaf/dxc_add_CL/I4
rename to tests/xcaf/xbf_add_CL/I4
diff --git a/tests/xcaf/dxc_add_CL/I5 b/tests/xcaf/xbf_add_CL/I5
similarity index 100%
rename from tests/xcaf/dxc_add_CL/I5
rename to tests/xcaf/xbf_add_CL/I5
diff --git a/tests/xcaf/dxc_add_CL/I6 b/tests/xcaf/xbf_add_CL/I6
similarity index 100%
rename from tests/xcaf/dxc_add_CL/I6
rename to tests/xcaf/xbf_add_CL/I6
diff --git a/tests/xml/data/ocaf/B7 b/tests/xml/data/ocaf/B7
index 469a33c3d9..a378f9d238 100644
--- a/tests/xml/data/ocaf/B7
+++ b/tests/xml/data/ocaf/B7
@@ -2,7 +2,7 @@ set aTestName "caf004-B3"
 puts ${aTestName}
 
 # Create two new documents Doc1, Doc2
-set FileFormat "MDTV-Standard"
+set FileFormat "BinOcaf"
 if { $FileSuffix == "xml" } {
    set FileFormat "XmlOcaf"
 }
diff --git a/tests/xml/grids.list b/tests/xml/grids.list
index cc8365d5d4..a6e7cea015 100644
--- a/tests/xml/grids.list
+++ b/tests/xml/grids.list
@@ -1,4 +1,4 @@
-001 ocaf_std
+001 ocaf_cbf
 002 ocaf_xml
-003 xcaf_dxc
+003 xcaf_xbf
 004 xcaf_xml
diff --git a/tests/xml/ocaf_std/begin b/tests/xml/ocaf_cbf/begin
old mode 100755
new mode 100644
similarity index 56%
rename from tests/xml/ocaf_std/begin
rename to tests/xml/ocaf_cbf/begin
index cf754c0912..051b21d5e1
--- a/tests/xml/ocaf_std/begin
+++ b/tests/xml/ocaf_cbf/begin
@@ -1,10 +1,10 @@
-set FileSuffix "std"
+set FileSuffix "cbf"
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-Standard
+NewDocument D BinOcaf
 UndoLimit D 100
 
 # Open a transaction
 NewCommand D
 
-set subgroup "ocaf_std"
+set subgroup "ocaf_cbf"
diff --git a/tests/xml/ocaf_std/cases.list b/tests/xml/ocaf_cbf/cases.list
similarity index 100%
rename from tests/xml/ocaf_std/cases.list
rename to tests/xml/ocaf_cbf/cases.list
diff --git a/tests/xml/xcaf_dxc/begin b/tests/xml/xcaf_xbf/begin
old mode 100755
new mode 100644
similarity index 60%
rename from tests/xml/xcaf_dxc/begin
rename to tests/xml/xcaf_xbf/begin
index 6a76165c50..664e627419
--- a/tests/xml/xcaf_dxc/begin
+++ b/tests/xml/xcaf_xbf/begin
@@ -1,12 +1,12 @@
 pload XDE
 
-set FileSuffix "dxc"
+set FileSuffix "xbf"
 
 # Create a new document and set UndoLimit
-NewDocument D MDTV-XCAF
+NewDocument D BinXCAF
 UndoLimit D 100
 
 # Open a transaction
 NewCommand D
 
-set subgroup "xcaf_dxc"
+set subgroup "xcaf_xbf"
diff --git a/tests/xml/xcaf_dxc/cases.list b/tests/xml/xcaf_xbf/cases.list
similarity index 100%
rename from tests/xml/xcaf_dxc/cases.list
rename to tests/xml/xcaf_xbf/cases.list