diff --git a/core/server/api/v2/upload.js b/core/server/api/v2/images.js
similarity index 92%
rename from core/server/api/v2/upload.js
rename to core/server/api/v2/images.js
index 7e359ea9c9..01f1b2bc83 100644
--- a/core/server/api/v2/upload.js
+++ b/core/server/api/v2/images.js
@@ -1,8 +1,8 @@
 const storage = require('../../adapters/storage');
 
 module.exports = {
-    docName: 'upload',
-    image: {
+    docName: 'images',
+    upload: {
         statusCode: 201,
         permissions: false,
         query(frame) {
diff --git a/core/server/api/v2/index.js b/core/server/api/v2/index.js
index d73475bd98..e84d5870c5 100644
--- a/core/server/api/v2/index.js
+++ b/core/server/api/v2/index.js
@@ -75,8 +75,8 @@ module.exports = {
         return shared.pipeline(require('./members'), localUtils);
     },
 
-    get upload() {
-        return shared.pipeline(require('./upload'), localUtils);
+    get images() {
+        return shared.pipeline(require('./images'), localUtils);
     },
 
     get tags() {
diff --git a/core/server/api/v2/utils/serializers/output/upload.js b/core/server/api/v2/utils/serializers/output/images.js
similarity index 71%
rename from core/server/api/v2/utils/serializers/output/upload.js
rename to core/server/api/v2/utils/serializers/output/images.js
index 54bfd702a9..5d50467ce6 100644
--- a/core/server/api/v2/utils/serializers/output/upload.js
+++ b/core/server/api/v2/utils/serializers/output/images.js
@@ -1,9 +1,9 @@
-const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:upload');
+const debug = require('ghost-ignition').debug('api:v2:utils:serializers:output:images');
 const mapper = require('./utils/mapper');
 
 module.exports = {
-    image(path, apiConfig, frame) {
-        debug('image');
+    upload(path, apiConfig, frame) {
+        debug('upload');
 
         return frame.response = {
             url: mapper.mapImage(path)
diff --git a/core/server/api/v2/utils/serializers/output/index.js b/core/server/api/v2/utils/serializers/output/index.js
index e8c4e0a5d6..f3fe87c2b9 100644
--- a/core/server/api/v2/utils/serializers/output/index.js
+++ b/core/server/api/v2/utils/serializers/output/index.js
@@ -59,8 +59,8 @@ module.exports = {
         return require('./members');
     },
 
-    get upload() {
-        return require('./upload');
+    get images() {
+        return require('./images');
     },
 
     get tags() {
diff --git a/core/server/web/api/v2/admin/routes.js b/core/server/web/api/v2/admin/routes.js
index c979771c21..f65d0b0a0a 100644
--- a/core/server/web/api/v2/admin/routes.js
+++ b/core/server/web/api/v2/admin/routes.js
@@ -197,7 +197,7 @@ module.exports = function apiRoutes() {
         upload.single('uploadimage'),
         shared.middlewares.validation.upload({type: 'images'}),
         shared.middlewares.image.normalize,
-        http(apiv2.upload.image)
+        http(apiv2.images.upload)
     );
 
     router.post('/images/profile-image',
@@ -206,7 +206,7 @@ module.exports = function apiRoutes() {
         shared.middlewares.validation.upload({type: 'images'}),
         shared.middlewares.validation.profileImage,
         shared.middlewares.image.normalize,
-        http(apiv2.upload.image)
+        http(apiv2.images.upload)
     );
 
     router.post('/images/icon',
@@ -214,7 +214,7 @@ module.exports = function apiRoutes() {
         upload.single('uploadimage'),
         shared.middlewares.validation.upload({type: 'icons'}),
         shared.middlewares.validation.blogIcon(),
-        http(apiv2.upload.image)
+        http(apiv2.images.upload)
     );
 
     // ## Invites
diff --git a/core/test/acceptance/old/admin/upload_spec.js b/core/test/acceptance/old/admin/images_spec.js
similarity index 98%
rename from core/test/acceptance/old/admin/upload_spec.js
rename to core/test/acceptance/old/admin/images_spec.js
index f895a654bb..2583c0a074 100644
--- a/core/test/acceptance/old/admin/upload_spec.js
+++ b/core/test/acceptance/old/admin/images_spec.js
@@ -8,7 +8,7 @@ const config = require('../../../../server/config');
 
 const ghost = testUtils.startGhost;
 
-describe('Upload API', function () {
+describe('Images API', function () {
     const images = [];
     let request;
 
diff --git a/core/test/regression/api/v2/admin/upload_spec.js b/core/test/regression/api/v2/admin/images_spec.js
similarity index 98%
rename from core/test/regression/api/v2/admin/upload_spec.js
rename to core/test/regression/api/v2/admin/images_spec.js
index 7e358e0a49..1962a5fe83 100644
--- a/core/test/regression/api/v2/admin/upload_spec.js
+++ b/core/test/regression/api/v2/admin/images_spec.js
@@ -8,7 +8,7 @@ const config = require('../../../../../server/config');
 
 const ghost = testUtils.startGhost;
 
-describe('Upload API', function () {
+describe('Images API', function () {
     const images = [];
     let request;