diff --git a/meson.build b/meson.build
index 055d0d55c..d838d18c8 100644
--- a/meson.build
+++ b/meson.build
@@ -228,7 +228,7 @@ onebinary_stuff += 'MistInTS'
 # onebinary_stuff += 'MistInTSRIST'
 # onebinary_stuff += 'MistInTSSRT'
 onebinary_stuff += 'MistOutAAC'
-# onebinary_stuff += 'MistOutCMAF'
+onebinary_stuff += 'MistOutCMAF'
 onebinary_stuff += 'MistOutDTSC'
 onebinary_stuff += 'MistOutEBML'
 onebinary_stuff += 'MistOutFLAC'
diff --git a/src/output/output_cmaf.cpp b/src/output/output_cmaf.cpp
index 77d1b4101..78dc4ae0e 100644
--- a/src/output/output_cmaf.cpp
+++ b/src/output/output_cmaf.cpp
@@ -723,7 +723,7 @@ namespace Mist{
   /* Smooth Streaming Manifest Generation */
   /****************************************/
 
-  std::string toUTF16(const std::string &original){
+  std::string toUTF16CMAF(const std::string &original){
     std::string result;
     result.append("\377\376", 2);
     for (std::string::const_iterator it = original.begin(); it != original.end(); it++){
@@ -845,7 +845,7 @@ namespace Mist{
     smoothAdaptation("video", vTracks, r);
     r << "</SmoothStreamingMedia>\n";
 
-    return toUTF16(r.str());
+    return toUTF16CMAF(r.str());
   }
 
   /**********************************/
diff --git a/src/output/output_mp4.cpp b/src/output/output_mp4.cpp
index f881befbe..82fd888d8 100644
--- a/src/output/output_mp4.cpp
+++ b/src/output/output_mp4.cpp
@@ -16,7 +16,7 @@ std::set<std::string> supportedAudio;
 std::set<std::string> supportedVideo;
 
 namespace Mist{
-  std::string toUTF16(const std::string &original){
+  std::string toUTF16MP4(const std::string &original){
     std::stringstream result;
     result << (char)0xFF << (char)0xFE;
     for (std::string::const_iterator it = original.begin(); it != original.end(); it++){
@@ -90,7 +90,7 @@ namespace Mist{
 
 
   std::string OutMP4::protectionHeader(size_t idx){
-    std::string tmp = toUTF16(M.getPlayReady(idx));
+    std::string tmp = toUTF16MP4(M.getPlayReady(idx));
     tmp.erase(0, 2); // remove first 2 characters
     std::stringstream resGen;
     resGen << (char)((tmp.size() + 10) & 0xFF);