diff --git a/k4FWCore/include/k4FWCore/MetaDataHandle.h b/k4FWCore/include/k4FWCore/MetaDataHandle.h
index eb1135df..6f6f87cb 100644
--- a/k4FWCore/include/k4FWCore/MetaDataHandle.h
+++ b/k4FWCore/include/k4FWCore/MetaDataHandle.h
@@ -11,14 +11,6 @@
 
 #include <type_traits>
 
-namespace k4FWCore {
-
-  static std::string metaDataHandleDescriptor(const std::string& collectionName, const std::string& key) {
-    return collectionName + "__" + key;
-  }
-
-}  // namespace k4FWCore
-
 template <typename T> class MetaDataHandle {
 public:
   MetaDataHandle();
@@ -88,7 +80,7 @@ template <typename T> void MetaDataHandle<T>::put(T value) {
 template <typename T> std::string MetaDataHandle<T>::fullDescriptor() {
   std::string full_descriptor;
   if (nullptr != m_dataHandle) {
-    full_descriptor = k4FWCore::metaDataHandleDescriptor(m_dataHandle->objKey(), m_descriptor);
+    full_descriptor = podio::collMetadataParamName(m_dataHandle->objKey(), m_descriptor);
     // remove the "/Event/" part of the collections' object key if in read mode
     if (m_mode == Gaudi::DataHandle::Reader) {
       full_descriptor.erase(0, 7);
diff --git a/k4FWCore/include/k4FWCore/PodioDataSvc.h b/k4FWCore/include/k4FWCore/PodioDataSvc.h
index d6d5f074..3b8011a4 100644
--- a/k4FWCore/include/k4FWCore/PodioDataSvc.h
+++ b/k4FWCore/include/k4FWCore/PodioDataSvc.h
@@ -54,7 +54,7 @@ class PodioDataSvc : public DataSvc {
   /// Resets caches of reader and event store, increases event counter
   void endOfRead();
 
-private:
+  /// TODO: Make this private again after conversions have been properly solved
   podio::Frame& getMetaDataFrame() { return m_metadataframe; }
 
 private: