diff --git a/Source/GUI/Qt/GUI_Main_xxxx_EditMenu.cpp b/Source/GUI/Qt/GUI_Main_xxxx_EditMenu.cpp
index aea53d5..598b1a6 100644
--- a/Source/GUI/Qt/GUI_Main_xxxx_EditMenu.cpp
+++ b/Source/GUI/Qt/GUI_Main_xxxx_EditMenu.cpp
@@ -64,7 +64,7 @@ void  GUI_Main_xxxx_EditMenu::updateEditMenu( QList<QPair<string, string> > forI
         //History data
         ZtringList History; History.Write(Ztring().From_UTF8(C->History(FileName, Field)));
         
-        //Data data
+        //Date data
         string Date;
         if (Field=="OriginationDate" || Field=="OriginationTime" || Field=="ICRD")
         {
@@ -75,6 +75,27 @@ void  GUI_Main_xxxx_EditMenu::updateEditMenu( QList<QPair<string, string> > forI
                 Date.clear();
         }
 
+        //FileTitle data
+        string FileTitle;
+        string FileTitle32;
+        string FileTitle256;
+        if (Field=="OriginatorReference" || Field=="Description")
+        {
+            FileTitle=FileName;
+            #ifdef _WIN32
+            size_t SeparatorPos=FileTitle.find_last_of('\\');
+            #else
+            size_t SeparatorPos=FileTitle.find_last_of('/');
+            #endif
+            if (SeparatorPos!=string::npos && SeparatorPos+1<FileTitle.size())
+                FileTitle=FileTitle.substr(SeparatorPos+1);
+            FileTitle=FileTitle.substr(0, FileTitle.find_last_of('.'));
+            if (Field=="OriginatorReference")
+                FileTitle32=FileTitle.size()>32?FileTitle.erase(32):FileTitle;
+            else
+                FileTitle256=FileTitle.size()>256?FileTitle.erase(256):FileTitle;
+        }
+
         //Copy
         if (!C->Get(FileName, Field).empty())
         {
@@ -115,6 +136,31 @@ void  GUI_Main_xxxx_EditMenu::updateEditMenu( QList<QPair<string, string> > forI
             connect(Action, SIGNAL(triggered(bool)), this, SLOT(onActionTriggered()));
         }
 
+        //Handling filename display
+        if (!FileTitle32.empty())
+        {
+            string Text;
+                Text="&Set OriginatorReference to file name ("+FileTitle32+")";
+
+            QAction* Action=new QAction(QString::fromUtf8(Text.c_str()));
+            Action->setProperty("Action", "Name");
+            Main->Menu_Edit->addAction(Action);
+            Main->Menu_Edit->addSeparator();
+            connect(Action, SIGNAL(triggered(bool)), this, SLOT(onActionTriggered()));
+        }
+
+        if (!FileTitle256.empty())
+        {
+            string Text;
+                Text="&Set BEXT description to file name ("+FileTitle256+")";
+
+            QAction* Action=new QAction(QString::fromUtf8(Text.c_str()));
+            Action->setProperty("Action", "Name");
+            Main->Menu_Edit->addAction(Action);
+            Main->Menu_Edit->addSeparator();
+            connect(Action, SIGNAL(triggered(bool)), this, SLOT(onActionTriggered()));
+        }
+
         //Handling date display
         if (!Date.empty())
         {
@@ -147,6 +193,8 @@ void  GUI_Main_xxxx_EditMenu::updateEditMenu( QList<QPair<string, string> > forI
     else if (Items.count()>1)
     {
         //Clear data
+        bool ShowOriginatorReference=true;
+        bool ShowBextDescription=true;
         bool ShowOriginationDate=true;
         bool ShowICRDDate=true;
         bool ShowClear=false;
@@ -161,6 +209,12 @@ void  GUI_Main_xxxx_EditMenu::updateEditMenu( QList<QPair<string, string> > forI
             if (Field!="OriginationDate" && Field!="OriginationTime")
                 ShowOriginationDate=false;
 
+            if (Field!="OriginatorReference")
+                ShowOriginatorReference=false;
+
+            if (Field!="Description")
+                ShowBextDescription=false;
+
             if (Field!="ICRD")
                 ShowICRDDate=false;
 
@@ -192,6 +246,25 @@ void  GUI_Main_xxxx_EditMenu::updateEditMenu( QList<QPair<string, string> > forI
             connect(Action, SIGNAL(triggered(bool)), this, SLOT(onActionTriggered()));
         }
 
+        //Handling originator reference display
+        if (ShowOriginatorReference)
+        {
+            QAction* Action=new QAction("Set OriginatorReference to files names");
+            Action->setProperty("Action", "Name");
+            Main->Menu_Edit->addSeparator();
+            Main->Menu_Edit->addAction(Action);
+            connect(Action, SIGNAL(triggered(bool)), this, SLOT(onActionTriggered()));
+        }
+
+        //Handling BEXT description display
+        if (ShowBextDescription)
+        {
+            QAction* Action=new QAction("Set BEXT description to files names");
+            Action->setProperty("Action", "Name");
+            Main->Menu_Edit->addAction(Action);
+            connect(Action, SIGNAL(triggered(bool)), this, SLOT(onActionTriggered()));
+        }
+
         //Handling origination date display
         if (ShowOriginationDate)
         {
@@ -274,6 +347,16 @@ void GUI_Main_xxxx_EditMenu::onActionTriggered()
         }
         Q_EMIT valuesChanged(false);
     }
+    else if (Action->property("Action")=="Name")
+    {
+        for (int Pos=0; Pos<Items.size(); Pos++)
+        {
+            string FileName=Items.at(Pos).first;
+            string Field=Items.at(Pos).second;
+            C->Set(FileName, Field, "FILENAME");
+        }
+        Q_EMIT valuesChanged(true);
+    }
     else if (Action->property("Action")=="Date")
     {
         for (int Pos=0; Pos<Items.size(); Pos++)
diff --git a/Source/Riff/Riff_Base.h b/Source/Riff/Riff_Base.h
index adcad97..e3b928b 100644
--- a/Source/Riff/Riff_Base.h
+++ b/Source/Riff/Riff_Base.h
@@ -411,6 +411,8 @@ class Riff_Base
         bool                IsRF64;
         bool                Trace_UseDec;
         bool                Read_Only;
+        bool                BextDescriptionFromFileName;
+        bool                OriginatorReferenceFromFileName;
 
         CriticalSection     CS;
         float               Progress;
@@ -450,6 +452,8 @@ class Riff_Base
             IsRF64=false;
             Trace_UseDec=false;
             Read_Only=false;
+            BextDescriptionFromFileName=false;
+            OriginatorReferenceFromFileName=false;
             Progress=0;
             Canceling=false;
         }
diff --git a/Source/Riff/Riff_Handler.cpp b/Source/Riff/Riff_Handler.cpp
index 74194ea..a2e21ed 100644
--- a/Source/Riff/Riff_Handler.cpp
+++ b/Source/Riff/Riff_Handler.cpp
@@ -280,6 +280,24 @@ void AdaptEOL(string& Value, adapteol Adapt=adapt_platform)
         Value=Value2;
 }
 
+//---------------------------------------------------------------------------
+inline string BaseFileName(const string& FileName)
+{
+    if (FileName.empty())
+        return FileName;
+
+    string ToReturn=FileName;
+    #ifdef _WIN32
+        size_t Pos=ToReturn.find_last_of("\\");
+    #else
+        size_t Pos=ToReturn.find_last_of("/");
+    #endif
+    if (Pos!=string::npos && Pos+1<ToReturn.size())
+        ToReturn=ToReturn.substr(Pos+1);
+
+    return ToReturn.substr(0, ToReturn.find_last_of('.'));
+}
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -1429,6 +1447,36 @@ bool Riff_Handler::Set_Internal(const string &Field_, const string &Value_, rule
         }
     }
 
+    // Use file name
+    if (Field=="originatorreference" || Field=="description")
+    {
+        if (Value=="FILENAME")
+        {
+            if (Chunks->Global)
+            {
+                Value=BaseFileName(Chunks->Global->File_Name.To_UTF8());
+                if (Field=="originatorreference" && Value.size()>32)
+                    Value=Value.erase(32);
+                else if (Field=="description" && Value.size()>256)
+                    Value=Value.erase(256);
+            }
+            else
+                Value=string();
+
+            if (Field=="originatorreference")
+                Chunks->Global->OriginatorReferenceFromFileName=true;
+            else
+                Chunks->Global->BextDescriptionFromFileName=true;
+        }
+        else
+        {
+            if (Field=="originatorreference" && Chunks->Global->OriginatorReferenceFromFileName && Value!=Get_Internal(Field))
+                    Chunks->Global->OriginatorReferenceFromFileName=false;
+            else if (Field=="description" && Chunks->Global->BextDescriptionFromFileName && Value!=Get_Internal(Field))
+                    Chunks->Global->BextDescriptionFromFileName=false;
+        }
+    }
+
     // EBU ISRC recommandations, link aXML ISRC and INFO ISRC
     string FieldToFill, ValueToFill;
     if (Rules.EBU_ISRC_Rec)
@@ -1990,6 +2038,12 @@ bool Riff_Handler::IsValid_Internal(const string &Field_, const string &Value_,
         //If error
         if (!Message.empty()) 
             IsValid_Errors<<"malformed input, Description "<<Message;
+
+        if (Chunks && Chunks->Global && Chunks->Global->BextDescriptionFromFileName)
+        {
+            if (Value.size()<BaseFileName(Chunks->Global->File_Name.To_UTF8()).size())
+                IsValid_Warnings<<"full file name does not fit in Description field";
+        }
     }
 
     //Originator
@@ -2078,6 +2132,12 @@ bool Riff_Handler::IsValid_Internal(const string &Field_, const string &Value_,
         //If error
         if (!Message.empty()) 
             IsValid_Errors<<"malformed input, OriginatorReference "<<Message;
+
+        if (Chunks && Chunks->Global && Chunks->Global->OriginatorReferenceFromFileName)
+        {
+            if (Value.size()<BaseFileName(Chunks->Global->File_Name.To_UTF8()).size())
+                IsValid_Warnings<<"full file name does not fit in OriginatorReference field";
+        }
     }
 
     //OriginationDate