diff --git a/apple/common/apple_cocoa_common.m b/apple/common/apple_cocoa_common.m
index 8f05800932..6f37e36806 100644
--- a/apple/common/apple_cocoa_common.m
+++ b/apple/common/apple_cocoa_common.m
@@ -624,7 +624,7 @@ static bool apple_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t f
    return true;
 }
 
-camera_driver_t camera_apple = {
+camera_driver_t camera_avfoundation = {
    apple_camera_init,
    apple_camera_free,
    apple_camera_start,
diff --git a/apple/iOS/Makefile b/apple/iOS/Makefile
index 41fed31413..8f51725788 100644
--- a/apple/iOS/Makefile
+++ b/apple/iOS/Makefile
@@ -24,7 +24,7 @@ ${APPLICATION_NAME}_FILES = $(SRC_DIR)/griffin/griffin.c \
 		  $(SRC_DIR)/apple/common/utility.m \
 
 COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_CORELOCATION -DHAVE_NETPLAY -DHAVE_RGUI -DHAVE_MENU -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_MOBILE -std=gnu99 -DHAVE_COREAUDIO -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_ZLIB -DWANT_ZLIB -DSINC_LOWER_QUALITY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_XMB -D_LZMA_UINT32_IS_ULONG -DHAVE_STRL
-COMMON_FLAGS += -DHAVE_CAMERA
+COMMON_FLAGS += -DHAVE_AVFOUNDATION
 COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error
 COMMON_IOS_OBJCFLAGS := -fobjc-arc 
 INCFLAGS       := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-common/include
diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj
index f0f14632b2..b7402236b0 100644
--- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj
+++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj
@@ -498,7 +498,7 @@
 					"-DHAVE_NETPLAY",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-					"-DHAVE_CAMERA",
+					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_CORELOCATION",
@@ -563,7 +563,7 @@
 					"-DHAVE_NETPLAY",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-					"-DHAVE_CAMERA",
+					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
@@ -600,7 +600,7 @@
 					"-DHAVE_NETPLAY",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-					"-DHAVE_CAMERA",
+					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
@@ -668,7 +668,7 @@
 					"-DHAVE_NETPLAY",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-					"-DHAVE_CAMERA",
+					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
@@ -727,7 +727,7 @@
 					"-DHAVE_NETPLAY",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-					"-DHAVE_CAMERA",
+					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
@@ -788,7 +788,7 @@
 					"-DHAVE_NETPLAY",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-					"-DHAVE_CAMERA",
+					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
@@ -854,7 +854,7 @@
 					"-DHAVE_NETPLAY",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-					"-DHAVE_CAMERA",
+					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
@@ -893,7 +893,7 @@
 					"-DHAVE_NETPLAY",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-					"-DHAVE_CAMERA",
+					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
diff --git a/camera/camera_driver.c b/camera/camera_driver.c
index d99fd60200..e5d634404e 100644
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@@ -32,7 +32,7 @@ static const camera_driver_t *camera_drivers[] = {
    &camera_android,
 #endif
 #ifdef HAVE_AVFOUNDATION
-    &camera_apple,
+    &camera_avfoundation,
 #endif
    &camera_null,
    NULL,
diff --git a/camera/camera_driver.h b/camera/camera_driver.h
index ee11cfa324..b99fee6a98 100644
--- a/camera/camera_driver.h
+++ b/camera/camera_driver.h
@@ -50,7 +50,7 @@ typedef struct camera_driver
 extern camera_driver_t camera_v4l2;
 extern camera_driver_t camera_android;
 extern camera_driver_t camera_rwebcam;
-extern camera_driver_t camera_apple;
+extern camera_driver_t camera_avfoundation;
 extern camera_driver_t camera_null;
 
 /**