diff --git a/app/controllers/return-versions.controller.js b/app/controllers/return-versions.controller.js
index 0a7d36f5b0..7fa6126529 100644
--- a/app/controllers/return-versions.controller.js
+++ b/app/controllers/return-versions.controller.js
@@ -5,13 +5,13 @@
  * @module ReturnVersionsController
  */
 
-const ViewService = require('../services/return-requirements/view.service.js')
+const ViewService = require('../services/return-versions/view.service.js')
 
 async function view (request, h) {
   const { id } = request.params
   const pageData = await ViewService.go(id)
 
-  return h.view('return-requirements/view.njk', {
+  return h.view('return-versions/view.njk', {
     ...pageData
   })
 }
diff --git a/app/presenters/return-requirements/view.presenter.js b/app/presenters/return-versions/view.presenter.js
similarity index 100%
rename from app/presenters/return-requirements/view.presenter.js
rename to app/presenters/return-versions/view.presenter.js
diff --git a/app/services/return-requirements/fetch-return-version.service.js b/app/services/return-versions/fetch-return-version.service.js
similarity index 100%
rename from app/services/return-requirements/fetch-return-version.service.js
rename to app/services/return-versions/fetch-return-version.service.js
diff --git a/app/services/return-requirements/view.service.js b/app/services/return-versions/view.service.js
similarity index 56%
rename from app/services/return-requirements/view.service.js
rename to app/services/return-versions/view.service.js
index 381c05c471..e5ff2b89f2 100644
--- a/app/services/return-requirements/view.service.js
+++ b/app/services/return-versions/view.service.js
@@ -1,17 +1,17 @@
 'use strict'
 
 /**
- * Orchestrates fetching and presenting the data for `/return-requirements/{sessionId}/view` page
+ * Orchestrates fetching and presenting the data for `/return-versions/{sessionId}/view` page
  * @module ViewService
  */
 
 const FetchReturnVersionService = require('./fetch-return-version.service.js')
-const ViewPresenter = require('../../presenters/return-requirements/view.presenter.js')
+const ViewPresenter = require('../../presenters/return-versions/view.presenter.js')
 
 /**
- * Orchestrates fetching and presenting the data for `/return-requirements/{sessionId}/view` page
+ * Orchestrates fetching and presenting the data for `/return-versions/{sessionId}/view` page
  *
- * @param {string} returnVersionId - The UUID for return requirement version
+ * @param {string} returnVersionId - The UUID for the return version
  *
  * @returns {Promise<object>} page data needed by the view template
  */
diff --git a/app/views/return-requirements/view.njk b/app/views/return-versions/view.njk
similarity index 100%
rename from app/views/return-requirements/view.njk
rename to app/views/return-versions/view.njk
diff --git a/test/controllers/return-versions.controller.test.js b/test/controllers/return-versions.controller.test.js
index 7550658041..d96377a646 100644
--- a/test/controllers/return-versions.controller.test.js
+++ b/test/controllers/return-versions.controller.test.js
@@ -9,7 +9,7 @@ const { describe, it, beforeEach, afterEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Things we need to stub
-const ViewService = require('../../app/services/return-requirements/view.service.js')
+const ViewService = require('../../app/services/return-versions/view.service.js')
 
 // For running our service
 const { init } = require('../../app/server.js')
diff --git a/test/presenters/return-requirements/view.presenter.test.js b/test/presenters/return-versions/view.presenter.test.js
similarity index 98%
rename from test/presenters/return-requirements/view.presenter.test.js
rename to test/presenters/return-versions/view.presenter.test.js
index 0b3c8148d9..976934318d 100644
--- a/test/presenters/return-requirements/view.presenter.test.js
+++ b/test/presenters/return-versions/view.presenter.test.js
@@ -14,9 +14,9 @@ const PointModel = require('../../../app/models/point.model.js')
 const ReturnVersionModel = require('../../../app/models/return-version.model.js')
 
 // Thing under test
-const ViewPresenter = require('../../../app/presenters/return-requirements/view.presenter.js')
+const ViewPresenter = require('../../../app/presenters/return-versions/view.presenter.js')
 
-describe('Return Requirements - View presenter', () => {
+describe('Return Versions - View presenter', () => {
   let returnVersion
 
   beforeEach(() => {
diff --git a/test/services/return-requirements/fetch-return-version.service.test.js b/test/services/return-versions/fetch-return-version.service.test.js
similarity index 95%
rename from test/services/return-requirements/fetch-return-version.service.test.js
rename to test/services/return-versions/fetch-return-version.service.test.js
index bf5bbdf68f..9b4fe3a2f6 100644
--- a/test/services/return-requirements/fetch-return-version.service.test.js
+++ b/test/services/return-versions/fetch-return-version.service.test.js
@@ -12,9 +12,9 @@ const RequirementsForReturnsSeeder = require('../../support/seeders/requirements
 const ModLogHelper = require('../../support/helpers/mod-log.helper.js')
 
 // Thing under test
-const FetchReturnVersionService = require('../../../app/services/return-requirements/fetch-return-version.service.js')
+const FetchReturnVersionService = require('../../../app/services/return-versions/fetch-return-version.service.js')
 
-describe('Return Requirements - Fetch Return Version service', () => {
+describe('Return Versions - Fetch Return Version service', () => {
   let licence
   let modLog
   let returnVersion
@@ -30,7 +30,7 @@ describe('Return Requirements - Fetch Return Version service', () => {
       user = seedData.user
     })
 
-    it('returns the details of the requirements for returns', async () => {
+    it('returns the details of the return version', async () => {
       const result = await FetchReturnVersionService.go(returnVersion.id)
 
       const [returnRequirementsOne, returnRequirementsTwo] = result.returnRequirements
diff --git a/test/services/return-requirements/view.service.test.js b/test/services/return-versions/view.service.test.js
similarity index 95%
rename from test/services/return-requirements/view.service.test.js
rename to test/services/return-versions/view.service.test.js
index 43eb7bb7e2..ac2f2b832b 100644
--- a/test/services/return-requirements/view.service.test.js
+++ b/test/services/return-versions/view.service.test.js
@@ -14,12 +14,12 @@ const LicenceModel = require('../../../app/models/licence.model.js')
 const ReturnVersionModel = require('../../../app/models/return-version.model.js')
 
 // Things we want to stub
-const FetchReturnVersionService = require('../../../app/services/return-requirements/fetch-return-version.service.js')
+const FetchReturnVersionService = require('../../../app/services/return-versions/fetch-return-version.service.js')
 
 // Thing under test
-const ViewService = require('../../../app/services/return-requirements/view.service.js')
+const ViewService = require('../../../app/services/return-versions/view.service.js')
 
-describe('Return Requirements - View service', () => {
+describe('Return Versions - View service', () => {
   const returnVersionId = '0c6ed18f-39fb-4d70-93bb-cf24453dbb70'
 
   beforeEach(async () => {