diff --git a/Control/DataModelTest/DataModelTestDataWriteCnv/CMakeLists.txt b/Control/DataModelTest/DataModelTestDataWriteCnv/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..786bd960e9a0d2b23c1222f41abea46de1186e46
--- /dev/null
+++ b/Control/DataModelTest/DataModelTestDataWriteCnv/CMakeLists.txt
@@ -0,0 +1,24 @@
+################################################################################
+# Package: DataModelTestDataWriteCnv
+################################################################################
+
+# Declare the package name:
+atlas_subdir( DataModelTestDataWriteCnv )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          PRIVATE
+                          Control/DataModelTest/DataModelTestDataCommon
+                          Control/DataModelTest/DataModelTestDataWrite
+                          Database/AthenaPOOL/AthenaPoolCnvSvc )
+
+# tag no_merge_componentslist was not recognized in automatic conversion in cmt2cmake
+
+# Component(s) in the package:
+atlas_add_poolcnv_library( DataModelTestDataWriteCnvPoolCnv
+                           src/*.cxx
+                           FILES DataModelTestDataWrite/BVec.h DataModelTestDataWrite/BDer.h DataModelTestDataWrite/DVec.h DataModelTestDataWrite/DDer.h DataModelTestDataWrite/ELVec.h DataModelTestDataWrite/G.h DataModelTestDataWrite/GVec.h DataModelTestDataWrite/GAuxContainer.h DataModelTestDataWrite/H.h DataModelTestDataWrite/HVec.h DataModelTestDataWrite/HAuxContainer.h DataModelTestDataWrite/HView.h DataModelTestDataCommon/BAux.h DataModelTestDataCommon/BAuxVec.h DataModelTestDataCommon/BAuxStandalone.h DataModelTestDataCommon/C.h DataModelTestDataCommon/CVec.h DataModelTestDataCommon/CAuxContainer.h DataModelTestDataCommon/CView.h DataModelTestDataCommon/CVecWithData.h DataModelTestDataCommon/CInfoAuxContainer.h DataModelTestDataCommon/CTrigAuxContainer.h
+                           TYPES_WITH_NAMESPACE DMTest::BVec DMTest::DVec DMTest::DDer DMTest::BDer DMTest::ELVec DMTest::BAux DMTest::BAuxVec DMTest::BAuxStandalone DMTest::C DMTest::CVec DMTest::CAuxContainer DMTest::G DMTest::GVec DMTest::GAuxContainer DMTest::CVecWithData DMTest::CInfoAuxContainer DMTest::CTrigAuxContainer DMTest::CView DMTest::H DMTest::HVec DMTest::HAuxContainer DMTest::HView
+                           LINK_LIBRARIES AthenaPoolUtilities DataModelTestDataCommon DataModelTestDataWriteLib AthenaPoolCnvSvcLib )
+
diff --git a/Control/DataModelTest/DataModelTestDataWriteCnv/cmt/requirements b/Control/DataModelTest/DataModelTestDataWriteCnv/cmt/requirements
index c4fc76c9eefa1cd099154757101694e28ca47e82..f2136f45946e59e3055c42200ba418d2f5ba23c2 100755
--- a/Control/DataModelTest/DataModelTestDataWriteCnv/cmt/requirements
+++ b/Control/DataModelTest/DataModelTestDataWriteCnv/cmt/requirements
@@ -25,18 +25,25 @@ apply_pattern poolcnv \
  typesWithNamespace="DMTest::BVec DMTest::DVec \
                      DMTest::DDer DMTest::BDer DMTest::ELVec \
                      DMTest::BAux DMTest::BAuxVec DMTest::BAuxStandalone \
-                     DMTest::C_v1 DMTest::CVec_v1 DMTest::CAuxContainer_v1 \
-                     DMTest::G_v1 DMTest::GVec_v1 DMTest::GAuxContainer_v1 \
-                     DMTest::CInfoAuxContainer_v1 \
-                     DMTest::CTrigAuxContainer_v1 " \
+                     DMTest::C DMTest::CVec DMTest::CAuxContainer \
+                     DMTest::G DMTest::GVec DMTest::GAuxContainer \
+                     DMTest::CVecWithData \
+                     DMTest::CInfoAuxContainer \
+                     DMTest::CTrigAuxContainer \
+                     DMTest::CView \
+                     DMTest::H DMTest::HVec DMTest::HAuxContainer \
+                     DMTest::HView " \
  files=" -s=${DataModelTestDataWrite_root}/DataModelTestDataWrite \
              BVec.h BDer.h DVec.h DDer.h ELVec.h \
-             versions/G_v1.h versions/GVec_v1.h versions/GAuxContainer_v1.h \
-        -s=${DataModelTestDataCommon_root}/DataModelTestDataCommon \
+             G.h GVec.h GAuxContainer.h \
+             H.h HVec.h HAuxContainer.h HView.h \
+         -s=${DataModelTestDataCommon_root}/DataModelTestDataCommon \
            BAux.h BAuxVec.h BAuxStandalone.h \
-           versions/C_v1.h versions/CVec_v1.h versions/CAuxContainer_v1.h \
-           versions/CInfoAuxContainer_v1.h \
-           versions/CTrigAuxContainer_v1.h "
+           C.h CVec.h CAuxContainer.h CView.h \
+           CVecWithData.h \
+           CInfoAuxContainer.h \
+           CTrigAuxContainer.h "
+