diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index acdddebc30..69b2ff1a38 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -275,8 +275,8 @@ SRC_CAMERA := \
 	$(wildcard common-hal/espcamera/*.c) \
 	$(wildcard bindings/espcamera/*.c)
 SRC_C += $(SRC_CAMERA)
-CFLAGS += -isystem esp32-camera/driver/include
-CFLAGS += -isystem esp32-camera/conversions/include
+CFLAGS += -isystem esp-camera/driver/include
+CFLAGS += -isystem esp-camera/conversions/include
 endif
 
 ifneq ($(CIRCUITPY_ESPIDF),0)
@@ -436,7 +436,7 @@ ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal
 endif
 
 ifneq ($(CIRCUITPY_ESPCAMERA),0)
-ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp32-camera/libesp32-camera.a
+ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp-camera/libesp-camera.a
 #$(error $(ESP_IDF_COMPONENTS_EXPANDED))
 endif
 
diff --git a/ports/espressif/common-hal/espcamera/Camera.c b/ports/espressif/common-hal/espcamera/Camera.c
index 7db8a4b4c1..cdf7ab63c8 100644
--- a/ports/espressif/common-hal/espcamera/Camera.c
+++ b/ports/espressif/common-hal/espcamera/Camera.c
@@ -35,7 +35,7 @@
 #include "shared-bindings/util.h"
 #include "common-hal/microcontroller/Pin.h"
 
-#include "esp32-camera/driver/private_include/cam_hal.h"
+#include "esp-camera/driver/private_include/cam_hal.h"
 
 #if !CONFIG_SPIRAM
 #error espcamera only works on boards configured with spiram, disable it in mpconfigboard.mk
diff --git a/ports/espressif/esp-idf-config/sdkconfig-psram-qio.defaults b/ports/espressif/esp-idf-config/sdkconfig-psram-qio.defaults
index d93069e02b..ad262b4918 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-psram-qio.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-psram-qio.defaults
@@ -1 +1,2 @@
 CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set