diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.cpp
similarity index 93%
rename from SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp
rename to SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.cpp
index 67b2bdef2a..f64be12cfa 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.cpp
@@ -1,4 +1,4 @@
-/*  Audio Input Device Info
+/*  Audio Format
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -8,7 +8,7 @@
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
-#include "AudioInfo.h"
+#include "AudioFormat.h"
 
 //#include <iostream>
 //using std::cout;
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.h
similarity index 83%
rename from SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h
rename to SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.h
index e4f934b9b4..b649c3b4e7 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.h
@@ -1,11 +1,11 @@
-/*  Audio Device Info
+/*  Audio Format
  *
  *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_AudioPipeline_AudioInfo_H
-#define PokemonAutomation_AudioPipeline_AudioInfo_H
+#ifndef PokemonAutomation_AudioPipeline_AudioFormat_H
+#define PokemonAutomation_AudioPipeline_AudioFormat_H
 
 #include "Common/Cpp/Containers/Pimpl.h"
 #include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp
index 618339eeb9..97942c04ad 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp
@@ -13,7 +13,7 @@
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/TestRunners/UnitTest.h"
 #include "Common/Cpp/TestRunners/UnitTestDatabase.h"
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 #include "AudioInputChoice.h"
 #include "AudioInfo_Tests.h"
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.h
index 202c7092c4..545ab18cd4 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.h
@@ -9,7 +9,7 @@
 
 #include <string>
 #include <vector>
-#include "AudioInfo.h"
+#include "AudioFormat.h"
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h
index ba4b78ba45..d6345345c8 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h
@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_AudioPipeline_AudioPassthroughPair_H
 #define PokemonAutomation_AudioPipeline_AudioPassthroughPair_H
 
-#include "AudioInfo.h"
+#include "AudioFormat.h"
 #include "AudioSourceDescriptor.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSource.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSource.h
index 422dae9e87..fb1c1fa48c 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSource.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSource.h
@@ -11,7 +11,7 @@
 #ifndef PokemonAutomation_AudioPipeline_AudioSource_H
 #define PokemonAutomation_AudioPipeline_AudioSource_H
 
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h
index fb0fcc2545..3865b43b71 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h
@@ -9,7 +9,7 @@
 
 #include <string>
 #include <vector>
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 #include "CommonFramework/AudioPipeline/AudioInputChoice.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h
index be47f2a9c6..aa5d64f683 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 #include <QAudioFormat>
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.h
index 1e14607d18..2ef2c7365b 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.h
@@ -16,7 +16,7 @@ using NativeAudioSource = QAudioSource;
 #include "Common/Cpp/LifetimeSanitizer.h"
 #include "Common/Cpp/StreamConverters.h"
 #include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 
 class QAudioFormat;
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp
index 13fdf32acf..3b0474bb8c 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp
@@ -13,7 +13,7 @@
 #include <QTimer>
 #include "3rdParty/QtWavFile/WavFile.h"
 #include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 #include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
 #include "AudioFileLoader.h"
 #include "AudioInputFile.h"
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.h
index edd7fa5288..2047d08070 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.h
@@ -15,7 +15,7 @@
 #include <QAudioSink>
 #include "Common/Cpp/LifetimeSanitizer.h"
 #include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp
index 6080fbb714..e72e70eb48 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp
@@ -41,7 +41,7 @@
 #include "Kernels/AudioPipeline/Kernels_ChannelMixer.h"
 #include "Kernels/AudioResampler/Kernels_AudioResampler.h"
 #include "CommonFramework/GlobalAutoPaths.h"
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 #include "CommonFramework/AudioPipeline/AudioInputChoice.h"
 #include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h"
 #include "CommonFramework/AudioPipeline/Tools/ChannelMixer.h"
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp
index ff25d7360e..f77c9dc064 100644
--- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp
@@ -10,7 +10,7 @@
 #include "Common/Cpp/Containers/Pimpl.tpp"   //  Pimpl<QAudioFormat> (AudioFormat) instantiations
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
 #include "CommonFramework/AudioPipeline/AudioInputChoice.h"
 #include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
 #include "CommonFramework/Recording/StreamHistoryOption.h"
diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake
index ebbc93c740..91397ce1db 100644
--- a/SerialPrograms/cmake/SourceFiles.cmake
+++ b/SerialPrograms/cmake/SourceFiles.cmake
@@ -493,8 +493,8 @@ file(GLOB LIBRARY_SOURCES
     ../Common/SerialPABotBase/SerialPABotBase_Protocol.h
     Source/CommonFramework/AudioPipeline/AudioConstants.h
     Source/CommonFramework/AudioPipeline/AudioFeed.h
-    Source/CommonFramework/AudioPipeline/AudioInfo.cpp
-    Source/CommonFramework/AudioPipeline/AudioInfo.h
+    Source/CommonFramework/AudioPipeline/AudioFormat.cpp
+    Source/CommonFramework/AudioPipeline/AudioFormat.h
     Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp
     Source/CommonFramework/AudioPipeline/AudioInfo_Tests.h
     Source/CommonFramework/AudioPipeline/AudioInputChoice.cpp