diff --git a/Source/VideoStreaming/igtlAV1Decoder.cxx b/Source/VideoStreaming/igtlAV1Decoder.cxx
index 15db2a56..9d2ebe56 100644
--- a/Source/VideoStreaming/igtlAV1Decoder.cxx
+++ b/Source/VideoStreaming/igtlAV1Decoder.cxx
@@ -14,7 +14,7 @@
 #include "igtlAV1Decoder.h"
 
 // AV1 includes
-#include "aomdx.h"
+#include "aom/aomdx.h"
 namespace igtl {
 
 static const AomInterfaceDecoder AV1StaticDecoder[] = { { &aom_codec_av1_dx } };
diff --git a/Source/VideoStreaming/igtlAV1Decoder.h b/Source/VideoStreaming/igtlAV1Decoder.h
index a6ce62bf..5d2842ee 100644
--- a/Source/VideoStreaming/igtlAV1Decoder.h
+++ b/Source/VideoStreaming/igtlAV1Decoder.h
@@ -18,7 +18,7 @@
 #include "igtlCodecCommonClasses.h"
 
 // AV1 includes
-#include "aom_decoder.h"
+#include "aom/aom_decoder.h"
 
 namespace igtl {
 
diff --git a/Source/VideoStreaming/igtlAV1Encoder.cxx b/Source/VideoStreaming/igtlAV1Encoder.cxx
index e352b2f1..84b757e5 100644
--- a/Source/VideoStreaming/igtlAV1Encoder.cxx
+++ b/Source/VideoStreaming/igtlAV1Encoder.cxx
@@ -14,7 +14,7 @@
 #include "igtlAV1Encoder.h"
 
 // AV1 includes
-#include "aomcx.h"
+#include "aom/aomcx.h"
 
 namespace igtl {
 
@@ -142,7 +142,7 @@ int igtlAV1Encoder::SetQP(int maxQP, int minQP)
 int igtlAV1Encoder::SetLosslessLink(bool linkMethod)
 {
   this->isLossLessLink = linkMethod;
-  if (aom_codec_control_(codec, AV1E_SET_LOSSLESS, linkMethod))
+  if (aom_codec_control(codec, AV1E_SET_LOSSLESS, linkMethod))
     {
     error_output(codec, "Failed to set lossless mode");
     return -1;
@@ -178,7 +178,7 @@ int igtlAV1Encoder::InitializeEncoder()
     return -1;
     }
   
-  if (aom_codec_control_(codec, AV1E_SET_LOSSLESS, this->GetLosslessLink()))
+  if (aom_codec_control(codec, AV1E_SET_LOSSLESS, this->GetLosslessLink()))
     {
     error_output(codec, "Failed to set lossless mode");
     return -1;
diff --git a/Source/VideoStreaming/igtlAV1Encoder.h b/Source/VideoStreaming/igtlAV1Encoder.h
index b3bbae12..88c1af5e 100644
--- a/Source/VideoStreaming/igtlAV1Encoder.h
+++ b/Source/VideoStreaming/igtlAV1Encoder.h
@@ -18,7 +18,7 @@
 #include "igtlCodecCommonClasses.h"
 
 // AV1 includes
-#include "aom_encoder.h"
+#include "aom/aom_encoder.h"
 
 namespace igtl {
 
diff --git a/Source/VideoStreaming/igtlCodecCommonClasses.h b/Source/VideoStreaming/igtlCodecCommonClasses.h
index caaca806..48ca4c05 100644
--- a/Source/VideoStreaming/igtlCodecCommonClasses.h
+++ b/Source/VideoStreaming/igtlCodecCommonClasses.h
@@ -158,7 +158,7 @@ class IGTLCommon_EXPORT GenericEncoder : public Object
   
   virtual int SetQP(int maxQP, int minQP){return -1;};
   
-  virtual int SetRCTaregetBitRate(unsigned int bitRate){return -1;};
+  virtual int SetRCTargetBitRate(unsigned int bitRate){return -1;};
   
   virtual int SetPicWidthAndHeight(unsigned int Width, unsigned int Height){return -1;};
   
diff --git a/Source/VideoStreaming/igtlH264Encoder.cxx b/Source/VideoStreaming/igtlH264Encoder.cxx
index 32d79445..7d9ae46d 100644
--- a/Source/VideoStreaming/igtlH264Encoder.cxx
+++ b/Source/VideoStreaming/igtlH264Encoder.cxx
@@ -184,7 +184,7 @@ int H264Encoder::FillSpecificParameters() {
   return 0;
 }
 
-int H264Encoder::SetRCTaregetBitRate(unsigned int bitRate)
+int H264Encoder::SetRCTargetBitRate(unsigned int bitRate)
 {
   this->sSvcParam.iTargetBitrate = bitRate;
   for (int i = 0; i < this->sSvcParam.iSpatialLayerNum; i++)
diff --git a/Source/VideoStreaming/igtlH264Encoder.h b/Source/VideoStreaming/igtlH264Encoder.h
index dbb66606..923dfbd9 100644
--- a/Source/VideoStreaming/igtlH264Encoder.h
+++ b/Source/VideoStreaming/igtlH264Encoder.h
@@ -158,7 +158,7 @@ class IGTLCommon_EXPORT H264Encoder: public GenericEncoder
    */
   int SetSpeed(int speed) override;
   
-  int SetRCTaregetBitRate(unsigned int bitRate) override;
+  int SetRCTargetBitRate(unsigned int bitRate) override;
   
   bool GetLosslessLink() override {return this->sSvcParam.bIsLosslessLink;};
   
diff --git a/Source/VideoStreaming/igtlH265Encoder.cxx b/Source/VideoStreaming/igtlH265Encoder.cxx
index 9490a295..2c084a81 100644
--- a/Source/VideoStreaming/igtlH265Encoder.cxx
+++ b/Source/VideoStreaming/igtlH265Encoder.cxx
@@ -64,7 +64,7 @@ int H265Encoder::FillSpecificParameters() {
   return 0;
 }
 
-int H265Encoder::SetRCTaregetBitRate(unsigned int bitRate)
+int H265Encoder::SetRCTargetBitRate(unsigned int bitRate)
 {
   this->sSvcParam->rc.aqMode = X265_AQ_VARIANCE;
   this->sSvcParam->rc.rateControlMode = X265_RC_ABR;
diff --git a/Source/VideoStreaming/igtlH265Encoder.h b/Source/VideoStreaming/igtlH265Encoder.h
index c18203e5..08e523fd 100644
--- a/Source/VideoStreaming/igtlH265Encoder.h
+++ b/Source/VideoStreaming/igtlH265Encoder.h
@@ -116,7 +116,7 @@ class IGTLCommon_EXPORT H265Encoder: public GenericEncoder
   
   int SetSpeed(int speed) override;
   
-  int SetRCTaregetBitRate(unsigned int bitRate) override;
+  int SetRCTargetBitRate(unsigned int bitRate) override;
   
   bool GetLosslessLink() override {return this->sSvcParam->bLossless;};
   
@@ -137,4 +137,4 @@ class IGTLCommon_EXPORT H265Encoder: public GenericEncoder
 };
 
 } //namespace igtl
-#endif
\ No newline at end of file
+#endif
diff --git a/Source/VideoStreaming/igtlVP9Encoder.cxx b/Source/VideoStreaming/igtlVP9Encoder.cxx
index 8e384acf..1fb1a0a4 100644
--- a/Source/VideoStreaming/igtlVP9Encoder.cxx
+++ b/Source/VideoStreaming/igtlVP9Encoder.cxx
@@ -133,7 +133,7 @@ int VP9Encoder::SetKeyFrameDistance(int frameNum)
 }
 
 
-int VP9Encoder::SetRCTaregetBitRate(unsigned int bitRate)
+int VP9Encoder::SetRCTargetBitRate(unsigned int bitRate)
 {
   // The bit rate in VPX is in Kilo
   int bitRateInKilo = bitRate/1000;
diff --git a/Source/VideoStreaming/igtlVP9Encoder.h b/Source/VideoStreaming/igtlVP9Encoder.h
index 42045ee0..7a3e8a73 100644
--- a/Source/VideoStreaming/igtlVP9Encoder.h
+++ b/Source/VideoStreaming/igtlVP9Encoder.h
@@ -81,7 +81,7 @@ class IGTLCommon_EXPORT VP9Encoder: public GenericEncoder
   
   int SetQP(int maxQP, int minQP) override;
   
-  int SetRCTaregetBitRate(unsigned int bitRate) override;
+  int SetRCTargetBitRate(unsigned int bitRate) override;
   
   int SetLosslessLink(bool linkMethod) override;
   
diff --git a/SuperBuild/External_AV1.cmake b/SuperBuild/External_AV1.cmake
index 0ee57ba2..5b8bed1e 100644
--- a/SuperBuild/External_AV1.cmake
+++ b/SuperBuild/External_AV1.cmake
@@ -28,7 +28,7 @@ ELSE()
       ENDIF()  
     ENDIF()
   ENDIF()
-  SET (AV1_INCLUDE_DIR "${CMAKE_BINARY_DIR}/Deps/AV1/aom" CACHE PATH "AV1 source directory" FORCE)
+  SET (AV1_INCLUDE_DIR "${CMAKE_BINARY_DIR}/Deps/AV1" CACHE PATH "AV1 source directory" FORCE)
   SET (AV1_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Deps/AV1-bin" CACHE PATH "AV1 library directory" FORCE)
   ExternalProject_Add(AV1
     PREFIX "${CMAKE_BINARY_DIR}/Deps/AV1-prefix"