diff --git a/cmdline/CtaAdminCmd.cpp b/cmdline/CtaAdminCmd.cpp
index fd69b412b8bf8a1e676929bcb781fe066b384f9d..72d8838397152918e31d0c5d649a7ffa989d326d 100644
--- a/cmdline/CtaAdminCmd.cpp
+++ b/cmdline/CtaAdminCmd.cpp
@@ -19,6 +19,7 @@
 
 #include <sstream>
 #include <iostream>
+#include <iomanip>
 
 #include "cmdline/Configuration.hpp"
 #include "CtaAdminCmd.hpp"
@@ -51,7 +52,26 @@ void RequestCallback<cta::xrd::Alert>::operator()(const cta::xrd::Alert &alert)
 template<>
 void XrdSsiPbRequestType::DataCallback(XrdSsiRequest::PRD_Xeq &post_process, char *response_bufptr, int response_buflen)
 {
-   std::cout.write(response_bufptr, response_buflen);
+   cta::admin::ArchiveFileLsItem item;
+
+   item.ParseFromArray(response_bufptr, response_buflen);
+
+   std::cout << std::setfill(' ') << std::setw(7)  << std::right << item.af().archive_file_id() << ' '
+             << std::setfill(' ') << std::setw(7)  << std::right << item.copy_nb()              << ' '
+             << std::setfill(' ') << std::setw(7)  << std::right << item.tf().vid()             << ' '
+             << std::setfill(' ') << std::setw(7)  << std::right << item.tf().f_seq()           << ' '
+             << std::setfill(' ') << std::setw(8)  << std::right << item.tf().block_id()        << ' '
+             << std::setfill(' ') << std::setw(8)  << std::right << item.af().disk_instance()   << ' '
+             << std::setfill(' ') << std::setw(7)  << std::right << item.af().disk_file_id()    << ' '
+             << std::setfill(' ') << std::setw(12) << std::right << item.af().file_size()       << ' '
+             << std::setfill(' ') << std::setw(13) << std::right << item.af().cs().type()       << ' '
+             << std::setfill(' ') << std::setw(14) << std::right << item.af().cs().value()      << ' '
+             << std::setfill(' ') << std::setw(13) << std::right << item.af().storage_class()   << ' '
+             << std::setfill(' ') << std::setw(8)  << std::right << item.af().df().owner()      << ' '
+             << std::setfill(' ') << std::setw(8)  << std::right << item.af().df().group()      << ' '
+             << std::setfill(' ') << std::setw(13) << std::right << item.af().creation_time()   << ' '
+             << item.af().df().path() << std::endl;
+
 }
 
 } // namespace XrdSsiPb
diff --git a/cmdline/EosCtaStub.cpp b/cmdline/EosCtaStub.cpp
index 03f5e482e4a05a6c7be9dd305a657490529bd00c..ccf05eb125a358475aef3a7820595188e846df63 100644
--- a/cmdline/EosCtaStub.cpp
+++ b/cmdline/EosCtaStub.cpp
@@ -112,7 +112,7 @@ void base64Decode(cta::eos::Notification &notification, const std::string &argva
       else if(key == "uid") notification.mutable_file()->mutable_owner()->set_uid(stoi(val));
       else if(key == "gid") notification.mutable_file()->mutable_owner()->set_gid(stoi(val));
       else if(key == "size") notification.mutable_file()->set_size(stoi(val));
-      else if(key == "xstype") notification.mutable_file()->mutable_cks()->set_name(val);
+      else if(key == "xstype") notification.mutable_file()->mutable_cks()->set_type(val);
       else if(key == "xs") notification.mutable_file()->mutable_cks()->set_value(val);
       else if(key == "mode") notification.mutable_file()->set_mode(stoi(val));
       else if(key == "file") notification.mutable_file()->set_lpath(val);
@@ -233,7 +233,7 @@ void fillNotification(cta::eos::Notification &notification, bool &isStderr, bool
       else if(argstr == "--diskfileowner")       notification.mutable_file()->mutable_owner()->set_username(argval);
       else if(argstr == "--diskfilegroup")       notification.mutable_file()->mutable_owner()->set_groupname(argval);
       else if(argstr == "--size")                notification.mutable_file()->set_size(std::stoi(argval));
-      else if(argstr == "--checksumtype")        notification.mutable_file()->mutable_cks()->set_name(argval);
+      else if(argstr == "--checksumtype")        notification.mutable_file()->mutable_cks()->set_type(argval);
       else if(argstr == "--checksumvalue")       notification.mutable_file()->mutable_cks()->set_value(argval);
       else if(argstr == "--diskfilepath")        notification.mutable_file()->set_lpath(argval);
       else if(argstr == "--storageclass")        {
diff --git a/xroot_plugins/XrdCtaArchiveFileLs.hpp b/xroot_plugins/XrdCtaArchiveFileLs.hpp
index ab2a91717034a69f61f54443d581fcd21d386f76..dba1b755bcb6fa210bb6849a8eae631dde08771b 100644
--- a/xroot_plugins/XrdCtaArchiveFileLs.hpp
+++ b/xroot_plugins/XrdCtaArchiveFileLs.hpp
@@ -189,26 +189,6 @@ XrdOucErrInfo xrdSfsFileError;
 
 m_listArchiveFilesCmd.reset(new xrootPlugins::ListArchiveFilesCmd(xrdSfsFileError, has_flag(OptionBoolean::SHOW_HEADER), std::move(archiveFileItor)));
 #endif
-#if 0
-   {
-      m_readBuffer <<
-        std::setfill(' ') << std::setw(7) << std::right << archiveFile.archiveFileID << " " <<
-        std::setfill(' ') << std::setw(7) << std::right << copyNb << " " <<
-        std::setfill(' ') << std::setw(7) << std::right << tapeFile.vid << " " <<
-        std::setfill(' ') << std::setw(7) << std::right << tapeFile.fSeq << " " <<
-        std::setfill(' ') << std::setw(8) << std::right << tapeFile.blockId << " " <<
-        std::setfill(' ') << std::setw(8) << std::right << archiveFile.diskInstance << " " <<
-        std::setfill(' ') << std::setw(7) << std::right << archiveFile.diskFileId << " " <<
-        std::setfill(' ') << std::setw(12) << std::right << archiveFile.fileSize << " " <<
-        std::setfill(' ') << std::setw(13) << std::right << archiveFile.checksumType << " " <<
-        std::setfill(' ') << std::setw(14) << std::right << archiveFile.checksumValue << " " <<
-        std::setfill(' ') << std::setw(13) << std::right << archiveFile.storageClass << " " <<
-        std::setfill(' ') << std::setw(8) << std::right << archiveFile.diskFileInfo.owner << " " <<
-        std::setfill(' ') << std::setw(8) << std::right << archiveFile.diskFileInfo.group << " " <<
-        std::setfill(' ') << std::setw(13) << std::right << archiveFile.creationTime << " " <<
-        archiveFile.diskFileInfo.path << "\n";
-   }
-#endif
 
 }} // namespace cta::xrd
 
diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.cpp b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
index 19838687808ffc81dc0ea97e417975f5e24a01db..8645638a3d27051671b0d95d8ec928b29fbf1e1c 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -330,7 +330,7 @@ void RequestMessage::processCLOSEW(const cta::eos::Notification &notification, c
    // and we need to decide what will be stored in the database.
    diskFileInfo.recoveryBlob = "deprecated";
 
-   std::string checksumtype(notification.file().cks().name());
+   std::string checksumtype(notification.file().cks().type());
    if(checksumtype == "adler") checksumtype = "ADLER32";   // replace this with an enum!
 
    std::string checksumvalue("0X" + notification.file().cks().value());
diff --git a/xroot_plugins/messages/cta_common.proto b/xroot_plugins/messages/cta_common.proto
index cb846afed2fdcc36542eb1d2bf5ef1866cab1fee..16c9f02eb04e5549081daa35f8ecc349ffe08419 100644
--- a/xroot_plugins/messages/cta_common.proto
+++ b/xroot_plugins/messages/cta_common.proto
@@ -27,7 +27,7 @@ message Clock {
 }
 
 message Checksum {
-  string name                = 1;       //< checksum name
+  string type                = 1;       //< checksum type
   string value               = 2;       //< checksum value
 }