diff --git a/VAUHRIRDataset.cs b/VAUHRIRDataset.cs
deleted file mode 100644
index 1462933384ff7e5418d7838665e81c7b45f6adc5..0000000000000000000000000000000000000000
--- a/VAUHRIRDataset.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class VAUHRIRDataset : MonoBehaviour {
-
-    protected int _ID = -1; // ID assigned by VA
-    [Tooltip("Absolute or relative file path (relative to Assets folder or any folder added to search path using AddSearchPath)")]
-    public string FilePath = ""; 
-    public string Name = ""; // Versatile name
-
-    public int ID
-    {
-        get
-        {
-            return _ID;
-        }
-    }
-
-    // Use this for initialization
-    void Start ()
-    {
-        if (FilePath.Length > 0)
-			_ID = VAUAdapter.VA.CreateDirectivityFromFile(FilePath);
-    }
-
-    private void OnDestroy()
-    {
-        if (_ID != -1)
-			VAUAdapter.VA.DeleteDirectivity(_ID);
-        _ID = -1;
-    }
-}
diff --git a/VAUAudiofileSignalSource.cs b/VAUSignalSourceAudioFile.cs
similarity index 95%
rename from VAUAudiofileSignalSource.cs
rename to VAUSignalSourceAudioFile.cs
index cca37c49524381c2a4096ec6e1c42238d3a8bdb0..428ce8d7cbdedbf61e476e91733fd1257b2d5ece 100644
--- a/VAUAudiofileSignalSource.cs
+++ b/VAUSignalSourceAudioFile.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class VAUAudiofileSignalSource : VAUSignalSource
+public class VAUSignalSourceAudioFile : VAUSignalSource
 {
     [Tooltip("Absolute or relative file path (relative to Assets folder or any folder added to search path using AddSearchPath)")]
     public string FilePath;
diff --git a/VAUListener.cs b/VAUSoundReceiver.cs
similarity index 99%
rename from VAUListener.cs
rename to VAUSoundReceiver.cs
index eb0ec5f053fb6a46cd46e3cf495158b57780c620..a5b2317beb4d19db9b94cb9cd52c19fbdee38dca 100644
--- a/VAUListener.cs
+++ b/VAUSoundReceiver.cs
@@ -12,7 +12,7 @@ public class VAUSoundReceiver : MonoBehaviour {
     public int NumMaxReverbZones = 2;
     public string VAAudioRenderer = "MyBinauralArtificialReverb";
     [Tooltip("Add custom VAUHRIR dataset.")]
-    public VAUHRIRDataset HRIR = null;
+    public VAUDirectivity HRIR = null;
     
     [Tooltip("Anthropometric data, for HRIR individualization or generic binaural cues")]
     public double HeadWidth = 0.12;