Add appendixImage Capitalisation

src/main/java/scot/carricksoftware/grants/capitalisation/census/census/CapitaliseCensus.java → src/main/java/scot/carricksoftware/grants/capitalisation/census/census/CapitaliseCensusCommand.java

@@ -7,7 +7,7 @@ package scot.carricksoftware.grants.capitalisation.census.census;
 
 import scot.carricksoftware.grants.commands.census.CensusCommand;
 
-public interface CapitaliseCensus {
+public interface CapitaliseCensusCommand {
 
     @SuppressWarnings({"unused", "EmptyMethod"})
     void capitalise(CensusCommand command);

src/main/java/scot/carricksoftware/grants/capitalisation/census/census/CapitaliseCensusImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/census/census/CapitaliseCensusCommandImpl.java

@@ -12,12 +12,12 @@ import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.census.CensusCommand;
 
 @Component
-public class CapitaliseCensusImpl implements CapitaliseCensus {
-    private static final Logger logger = LogManager.getLogger(CapitaliseCensusImpl.class);
+public class CapitaliseCensusCommandImpl implements CapitaliseCensusCommand {
+    private static final Logger logger = LogManager.getLogger(CapitaliseCensusCommandImpl.class);
 
     private final CapitaliseString capitaliseString;
 
-    public CapitaliseCensusImpl(CapitaliseString capitaliseString) {
+    public CapitaliseCensusCommandImpl(CapitaliseString capitaliseString) {
         this.capitaliseString = capitaliseString;
     }
 

src/main/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusEntry.java → src/main/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusEntryCommand.java

@@ -7,7 +7,7 @@ package scot.carricksoftware.grants.capitalisation.census.censusentry;
 
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 
-public interface CapitaliseCensusEntry {
+public interface CapitaliseCensusEntryCommand {
 
     @SuppressWarnings("EmptyMethod")
     void capitalise(@SuppressWarnings("unused") CensusEntryCommand command);

src/main/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusEntryImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusEntryCommandImpl.java

@@ -12,13 +12,13 @@ import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 
 @Component
-public class CapitaliseCensusEntryImpl implements CapitaliseCensusEntry {
+public class CapitaliseCensusEntryCommandImpl implements CapitaliseCensusEntryCommand {
 
-    private static final Logger logger = LogManager.getLogger(CapitaliseCensusEntryImpl.class);
+    private static final Logger logger = LogManager.getLogger(CapitaliseCensusEntryCommandImpl.class);
 
     private final CapitaliseString capitaliseString;
 
-    public CapitaliseCensusEntryImpl(CapitaliseString capitaliseString) {
+    public CapitaliseCensusEntryCommandImpl(CapitaliseString capitaliseString) {
         this.capitaliseString = capitaliseString;
     }
 

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificate.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateCommand.java

@@ -3,11 +3,11 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.birthcertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
 
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 
-public interface CapitaliseBirthCertificate {
+public interface CapitaliseBirthCertificateCommand {
 
     @SuppressWarnings({"unused", "EmptyMethod"})
     void capitalise(BirthCertificateCommand command);

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificateImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateCommandImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.birthcertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -12,13 +12,13 @@ import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 
 @Component
-public class CapitaliseBirthCertificateImpl implements CapitaliseBirthCertificate {
+public class CapitaliseBirthCertificateCommandImpl implements CapitaliseBirthCertificateCommand {
 
-    private static final Logger logger = LogManager.getLogger(CapitaliseBirthCertificateImpl.class);
+    private static final Logger logger = LogManager.getLogger(CapitaliseBirthCertificateCommandImpl.class);
 
     private final CapitaliseString capitaliseString;
 
-    public CapitaliseBirthCertificateImpl(CapitaliseString capitaliseString) {
+    public CapitaliseBirthCertificateCommandImpl(CapitaliseString capitaliseString) {
         this.capitaliseString = capitaliseString;
     }
 

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificate.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificateCommand.java

@@ -7,7 +7,7 @@ package scot.carricksoftware.grants.capitalisation.certificates.deathcertificate
 
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 
-public interface CapitaliseDeathCertificate {
+public interface CapitaliseDeathCertificateCommand {
 
     @SuppressWarnings({"unused", "EmptyMethod"})
     void capitalise(DeathCertificateCommand command);

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificateImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificateCommandImpl.java

@@ -12,13 +12,13 @@ import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 
 @Component
-public class CapitaliseDeathCertificateImpl implements CapitaliseDeathCertificate {
+public class CapitaliseDeathCertificateCommandImpl implements CapitaliseDeathCertificateCommand {
 
-    private static final Logger logger = LogManager.getLogger(CapitaliseDeathCertificateImpl.class);
+    private static final Logger logger = LogManager.getLogger(CapitaliseDeathCertificateCommandImpl.class);
 
     private final CapitaliseString capitaliseString;
 
-    public CapitaliseDeathCertificateImpl(CapitaliseString capitaliseString) {
+    public CapitaliseDeathCertificateCommandImpl(CapitaliseString capitaliseString) {
         this.capitaliseString = capitaliseString;
     }
 

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificate.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificateCommand.java

@@ -7,7 +7,7 @@ package scot.carricksoftware.grants.capitalisation.certificates.marriagecertific
 
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 
-public interface CapitaliseMarriageCertificate {
+public interface CapitaliseMarriageCertificateCommand {
 
     @SuppressWarnings({"unused", "EmptyMethod"})
     void capitalise( MarriageCertificateCommand command);

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificateImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificateCommandImpl.java

@@ -12,13 +12,13 @@ import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 
 @Component
-public class CapitaliseMarriageCertificateImpl implements CapitaliseMarriageCertificate {
+public class CapitaliseMarriageCertificateCommandImpl implements CapitaliseMarriageCertificateCommand {
 
-    private static final Logger logger = LogManager.getLogger(CapitaliseMarriageCertificateImpl.class);
+    private static final Logger logger = LogManager.getLogger(CapitaliseMarriageCertificateCommandImpl.class);
 
     private final CapitaliseString capitaliseString;
 
-    public CapitaliseMarriageCertificateImpl(CapitaliseString capitaliseString) {
+    public CapitaliseMarriageCertificateCommandImpl(CapitaliseString capitaliseString) {
         this.capitaliseString = capitaliseString;
     }
 

src/main/java/scot/carricksoftware/grants/capitalisation/images/appendiximage/CapitaliseAppendixImageCommand.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.capitalisation.images.appendiximage;
+
+import scot.carricksoftware.grants.commands.images.AppendixImageCommand;
+
+public interface CapitaliseAppendixImageCommand {
+
+    @SuppressWarnings({"unused", "EmptyMethod"})
+    void capitalise(AppendixImageCommand command);
+}

src/main/java/scot/carricksoftware/grants/capitalisation/images/appendiximage/CapitaliseAppendixImageCommandImpl.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.capitalisation.images.appendiximage;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.capitalisation.CapitaliseString;
+import scot.carricksoftware.grants.commands.images.AppendixImageCommand;
+
+
+@Component
+public class CapitaliseAppendixImageCommandImpl implements CapitaliseAppendixImageCommand {
+
+    private static final Logger logger = LogManager.getLogger(CapitaliseAppendixImageCommandImpl.class);
+
+    private final CapitaliseString capitaliseString;
+
+    public CapitaliseAppendixImageCommandImpl(CapitaliseString capitaliseString) {
+        this.capitaliseString = capitaliseString;
+    }
+
+    @Override
+    public void capitalise(AppendixImageCommand appendixImageCommand) {
+        logger.debug("CapitaliseAppendixImage::capitalise");
+        appendixImageCommand.setCaption(capitaliseString.capitalise(appendixImageCommand.getCaption()));
+    }
+
+}

src/main/java/scot/carricksoftware/grants/capitalisation/images/personimages/CapitalisePersonImage.java → src/main/java/scot/carricksoftware/grants/capitalisation/images/personimage/CapitalisePersonImageCommand.java

@@ -3,11 +3,11 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.images.personimages;
+package scot.carricksoftware.grants.capitalisation.images.personimage;
 
 import scot.carricksoftware.grants.commands.images.PersonImageCommand;
 
-public interface CapitalisePersonImage {
+public interface CapitalisePersonImageCommand {
 
     @SuppressWarnings({"unused", "EmptyMethod"})
     void capitalise(PersonImageCommand command);

src/main/java/scot/carricksoftware/grants/capitalisation/images/personimages/CapitalisePersonImageImpl.java → src/main/java/scot/carricksoftware/grants/capitalisation/images/personimage/CapitalisePersonImageCommandImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.images.personimages;
+package scot.carricksoftware.grants.capitalisation.images.personimage;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -12,13 +12,13 @@ import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.images.PersonImageCommand;
 
 @Component
-public class CapitalisePersonImageImpl implements CapitalisePersonImage {
+public class CapitalisePersonImageCommandImpl implements CapitalisePersonImageCommand {
 
-    private static final Logger logger = LogManager.getLogger(CapitalisePersonImageImpl.class);
+    private static final Logger logger = LogManager.getLogger(CapitalisePersonImageCommandImpl.class);
 
     private final CapitaliseString capitaliseString;
 
-    public CapitalisePersonImageImpl(CapitaliseString capitaliseString) {
+    public CapitalisePersonImageCommandImpl(CapitaliseString capitaliseString) {
         this.capitaliseString = capitaliseString;
     }
 

src/main/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.census.census.CapitaliseCensus;
+import scot.carricksoftware.grants.capitalisation.census.census.CapitaliseCensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
@@ -34,19 +34,19 @@ public class CensusFormControllerImpl implements CensusFormController {
     private static final Logger logger = LogManager.getLogger(CensusFormControllerImpl.class);
     private final CensusService censusService;
     private final CensusCommandValidator censusCommandValidator;
-    private final CapitaliseCensus capitaliseCensus;
+    private final CapitaliseCensusCommand capitaliseCensusCommand;
     private final CensusConverter censusConverter;
     private final PlaceService placeService;
 
 
     public CensusFormControllerImpl(CensusService censusService,
                                     CensusCommandValidator censusCommandValidator,
-                                    CapitaliseCensus capitaliseCensusImpl,
+                                    CapitaliseCensusCommand capitaliseCensusCommandImpl,
                                     CensusConverter censusConverter,
                                     PlaceService placeService) {
         this.censusService = censusService;
         this.censusCommandValidator = censusCommandValidator;
-        this.capitaliseCensus = capitaliseCensusImpl;
+        this.capitaliseCensusCommand = capitaliseCensusCommandImpl;
         this.censusConverter = censusConverter;
         this.placeService = placeService;
     }
@@ -75,7 +75,7 @@ public class CensusFormControllerImpl implements CensusFormController {
     public String saveOrUpdate(@Valid @ModelAttribute CensusCommand censusCommand, BindingResult bindingResult, Model model) {
         logger.debug("CensusFormControllerImpl::saveOrUpdate");
 
-        capitaliseCensus.capitalise(censusCommand);
+        capitaliseCensusCommand.capitalise(censusCommand);
         censusCommandValidator.validate(censusCommand, bindingResult);
 
 

src/main/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntry;
+import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
@@ -37,7 +37,7 @@ public class CensusEntryFormControllerImpl implements CensusEntryFormController
     private final CensusEntryService censusEntryService;
     private final CensusEntryCommandValidator censusEntryCommandValidator;
     private final CensusEntryConverter censusEntryConverter;
-    private final CapitaliseCensusEntry capitaliseCensusEntry;
+    private final CapitaliseCensusEntryCommand capitaliseCensusEntryCommand;
     private final PersonService personService;
     private final CensusService censusService;
     private final UpdateRecordedYearOfBirth updateRecordedYearOfBirth;
@@ -47,13 +47,13 @@ public class CensusEntryFormControllerImpl implements CensusEntryFormController
     public CensusEntryFormControllerImpl(CensusEntryService censusEntryService,
                                          CensusEntryCommandValidator censusEntryCommandValidator,
                                          CensusEntryConverter censusEntryConverter,
-                                         CapitaliseCensusEntry capitaliseCensusEntry,
+                                         CapitaliseCensusEntryCommand capitaliseCensusEntryCommand,
                                          PersonService personService,
                                          CensusService censusService, UpdateRecordedYearOfBirth updateRecordedYearOfBirth) {
         this.censusEntryService = censusEntryService;
         this.censusEntryCommandValidator = censusEntryCommandValidator;
         this.censusEntryConverter = censusEntryConverter;
-        this.capitaliseCensusEntry = capitaliseCensusEntry;
+        this.capitaliseCensusEntryCommand = capitaliseCensusEntryCommand;
         this.personService = personService;
         this.censusService = censusService;
         this.updateRecordedYearOfBirth = updateRecordedYearOfBirth;
@@ -85,7 +85,7 @@ public class CensusEntryFormControllerImpl implements CensusEntryFormController
     public String saveOrUpdate(@Valid @ModelAttribute CensusEntryCommand censusEntryCommand, BindingResult bindingResult, Model model) {
         logger.debug("CensusEntryFormControllerImpl::saveOrUpdate");
 
-        capitaliseCensusEntry.capitalise(censusEntryCommand);
+        capitaliseCensusEntryCommand.capitalise(censusEntryCommand);
         censusEntryCommandValidator.validate(censusEntryCommand, bindingResult);
 
 

src/main/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
@@ -39,7 +39,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     private final BirthCertificateCommandConverterImpl birthCertificateCommandConverter;
     private final BirthCertificateConverterImpl birthCertificateConverter;
     private final BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImpl;
-    private final CapitaliseBirthCertificate capitaliseBirthCertificate;
+    private final CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommand;
     private final UpdateCertifiedYearOfBirth updateCertifiedYearOfBirth;
     private final AddAttributes addAttributes;
 
@@ -48,7 +48,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
                                               BirthCertificateCommandConverterImpl birthCertificateCommandConverter,
                                               BirthCertificateConverterImpl birthCertificateConverter,
                                               BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImpl,
-                                              CapitaliseBirthCertificate capitaliseBirthCertificate,
+                                              CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommand,
                                               UpdateCertifiedYearOfBirth updateCertifiedYearOfBirth,
                                               AddAttributes addAttributes) {
         this.birthCertificateService = birthCertificateService;
@@ -57,7 +57,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
 
         this.birthCertificateConverter = birthCertificateConverter;
         this.birthCertificateCommandValidatorImpl = birthCertificateCommandValidatorImpl;
-        this.capitaliseBirthCertificate = capitaliseBirthCertificate;
+        this.capitaliseBirthCertificateCommand = capitaliseBirthCertificateCommand;
         this.updateCertifiedYearOfBirth = updateCertifiedYearOfBirth;
         this.addAttributes = addAttributes;
     }
@@ -89,7 +89,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");
 
         birthCertificateCommandValidatorImpl.validate(birthCertificateCommand, bindingResult);
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
 
 
         if (bindingResult.hasErrors()) {

src/main/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
@@ -39,7 +39,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     private final DeathCertificateCommandConverter deathCertificateCommandConverter;
     private final DeathCertificateConverter deathCertificateConverter;
     private final DeathCertificateCommandValidator deathCertificateCommandValidator;
-    private final CapitaliseDeathCertificate capitaliseDeathCertificate;
+    private final CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommand;
     private final UpdateCertifiedYearOfDeath updateCertifiedYearOfDeath;
     private final AddAttributes addAttributes;
 
@@ -48,7 +48,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
                                               DeathCertificateCommandConverter deathCertificateCommandConverter,
                                               DeathCertificateConverter deathCertificateConverter,
                                               DeathCertificateCommandValidator deathCertificateCommandValidator,
-                                              CapitaliseDeathCertificate capitaliseDeathCertificate,
+                                              CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommand,
                                               UpdateCertifiedYearOfDeath updateCertifiedYearOfDeath, AddAttributes addAttributes) {
         this.deathCertificateService = deathCertificateService;
         this.deathCertificateCommandConverter = deathCertificateCommandConverter;
@@ -57,7 +57,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
         this.deathCertificateConverter = deathCertificateConverter;
         this.deathCertificateCommandValidator = deathCertificateCommandValidator;
 
-        this.capitaliseDeathCertificate = capitaliseDeathCertificate;
+        this.capitaliseDeathCertificateCommand = capitaliseDeathCertificateCommand;
         this.updateCertifiedYearOfDeath = updateCertifiedYearOfDeath;
         this.addAttributes = addAttributes;
     }
@@ -89,7 +89,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
         logger.debug("DeathCertificateFormControllerImpl::saveOrUpdate");
 
         deathCertificateCommandValidator.validate(deathCertificateCommand, bindingResult);
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
 
         if (bindingResult.hasErrors()) {
             bindingResult.getAllErrors().forEach(error -> logger.debug(error.getDefaultMessage()));

src/main/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerImpl.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
@@ -40,7 +40,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
     private final MarriageCertificateCommandConverterImpl marriageCertificateCommandConverter;
     private final MarriageCertificateConverterImpl marriageCertificateConverter;
     private final MarriageCertificateCommandValidator marriageCertificateCommandValidator;
-    private final CapitaliseMarriageCertificate capitaliseMarriageCertificate;
+    private final CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommand;
     private final SetYearMarried setYearMarried;
     private final AddAttributes addAttributes;
 
@@ -49,7 +49,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
                                                  MarriageCertificateCommandConverterImpl marriageCertificateCommandConverter,
                                                  MarriageCertificateConverterImpl marriageCertificateConverter,
                                                  MarriageCertificateCommandValidator marriageCertificateCommandValidator,
-                                                 CapitaliseMarriageCertificate capitaliseMarriageCertificate,
+                                                 CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommand,
                                                  SetYearMarried setYearMarried, AddAttributes addAttributes) {
         this.marriageCertificateService = marriageCertificateService;
         this.marriageCertificateCommandConverter = marriageCertificateCommandConverter;
@@ -57,7 +57,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
 
         this.marriageCertificateConverter = marriageCertificateConverter;
         this.marriageCertificateCommandValidator = marriageCertificateCommandValidator;
-        this.capitaliseMarriageCertificate = capitaliseMarriageCertificate;
+        this.capitaliseMarriageCertificateCommand = capitaliseMarriageCertificateCommand;
         this.setYearMarried = setYearMarried;
         this.addAttributes = addAttributes;
     }
@@ -95,7 +95,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         logger.debug("MarriageCertificateFormControllerImpl::saveOrUpdate");
 
         marriageCertificateCommandValidator.validate(marriageCertificateCommand, bindingResult);
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         setYearMarried.setDatesMarried(marriageCertificateCommand);
 
 

src/main/java/scot/carricksoftware/grants/controllers/images/personImages/PersonImageFormControllerImpl.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import scot.carricksoftware.grants.capitalisation.images.personimages.CapitalisePersonImage;
+import scot.carricksoftware.grants.capitalisation.images.personimage.CapitalisePersonImageCommand;
 import scot.carricksoftware.grants.commands.images.PersonImageCommand;
 import scot.carricksoftware.grants.commands.images.PersonImageCommandImpl;
 import scot.carricksoftware.grants.constants.*;
@@ -38,7 +38,7 @@ public class PersonImageFormControllerImpl implements PersonImageFormController
     private final PersonImageCommandValidatorImpl personImageCommandValidatorImpl;
     private final PersonService personService;
     private final ImageService imageService;
-    private final CapitalisePersonImage capitalisePersonImage;
+    private final CapitalisePersonImageCommand capitalisePersonImageCommand;
 
 
     public PersonImageFormControllerImpl(PersonImageService personImageService,
@@ -47,7 +47,7 @@ public class PersonImageFormControllerImpl implements PersonImageFormController
                                          PersonImageCommandValidatorImpl personImageCommandValidatorImpl,
                                          PersonService personService,
                                          ImageService imageService,
-                                         CapitalisePersonImage capitalisePersonImage) {
+                                         CapitalisePersonImageCommand capitalisePersonImageCommand) {
 
         this.personImageService = personImageService;
         this.personImageCommandConverter = personImageCommandConverter;
@@ -57,7 +57,7 @@ public class PersonImageFormControllerImpl implements PersonImageFormController
         this.personImageCommandValidatorImpl = personImageCommandValidatorImpl;
         this.personService = personService;
         this.imageService = imageService;
-        this.capitalisePersonImage = capitalisePersonImage;
+        this.capitalisePersonImageCommand = capitalisePersonImageCommand;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -86,7 +86,7 @@ public class PersonImageFormControllerImpl implements PersonImageFormController
     public String saveOrUpdate(@Valid @ModelAttribute PersonImageCommand personImageCommand, BindingResult bindingResult, Model model) {
         logger.debug("PersonImageFormControllerImpl::saveOrUpdate");
 
-        capitalisePersonImage.capitalise(personImageCommand);
+        capitalisePersonImageCommand.capitalise(personImageCommand);
         personImageCommandValidatorImpl.validate(personImageCommand, bindingResult);
 
         if (bindingResult.hasErrors()) {

src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseBirthCertificateLengthTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseBirthCertificateCommandLengthTest.java

@@ -14,7 +14,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @ExtendWith(MockitoExtension.class)
-public class CapitaliseBirthCertificateLengthTest {
+public class CapitaliseBirthCertificateCommandLengthTest {
 
     private CapitaliseString capitaliseString;
 

src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseBirthCertificateStringTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseBirthCertificateCommandStringTest.java

@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-class CapitaliseBirthCertificateStringTest {
+class CapitaliseBirthCertificateCommandStringTest {
 
     private CapitaliseString capitaliseString;
 

src/test/java/scot/carricksoftware/grants/capitalisation/census/census/CapitaliseCensusTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/census/census/CapitaliseCensusCommandTest.java

@@ -19,16 +19,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseCensusTest {
+class CapitaliseCensusCommandTest {
 
-    private CapitaliseCensus capitaliseCensus;
+    private CapitaliseCensusCommand capitaliseCensusCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
 
     @BeforeEach
     void setUp() {
-        capitaliseCensus = new CapitaliseCensusImpl(capitaliseStringMock);
+        capitaliseCensusCommand = new CapitaliseCensusCommandImpl(capitaliseStringMock);
     }
 
     @Test
@@ -36,7 +36,7 @@ class CapitaliseCensusTest {
         CensusCommand censusCommand = new CensusCommandImpl();
         when(capitaliseStringMock.capitalise("lower")).thenReturn("Lower");
         censusCommand.setFilledInBy("lower");
-        capitaliseCensus.capitalise(censusCommand);
+        capitaliseCensusCommand.capitalise(censusCommand);
         assertEquals("Lower", censusCommand.getFilledInBy());
     }
 }

src/test/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusEntryTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusCommandEntryTest.java

@@ -21,9 +21,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseCensusEntryTest {
+class CapitaliseCensusCommandEntryTest {
 
-    private CapitaliseCensusEntry capitaliseCensusEntry;
+    private CapitaliseCensusEntryCommand capitaliseCensusEntryCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -32,7 +32,7 @@ class CapitaliseCensusEntryTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseCensusEntry = new CapitaliseCensusEntryImpl(capitaliseStringMock);
+        capitaliseCensusEntryCommand = new CapitaliseCensusEntryCommandImpl(capitaliseStringMock);
         censusEntryCommand = new CensusEntryCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -40,35 +40,35 @@ class CapitaliseCensusEntryTest {
     @Test
     void nameTest() {
         censusEntryCommand.setName("lower");
-        capitaliseCensusEntry.capitalise(censusEntryCommand);
+        capitaliseCensusEntryCommand.capitalise(censusEntryCommand);
         assertEquals("Lower", censusEntryCommand.getName());
     }
 
     @Test
     void industryOrServiceTest() {
         censusEntryCommand.setIndustryOrService("lower");
-        capitaliseCensusEntry.capitalise(censusEntryCommand);
+        capitaliseCensusEntryCommand.capitalise(censusEntryCommand);
         assertEquals("Lower", censusEntryCommand.getIndustryOrService());
     }
 
     @Test
     void whereBornTest() {
         censusEntryCommand.setWhereBorn("lower");
-        capitaliseCensusEntry.capitalise(censusEntryCommand);
+        capitaliseCensusEntryCommand.capitalise(censusEntryCommand);
         assertEquals("Lower", censusEntryCommand.getWhereBorn());
     }
 
     @Test
     void personalOccupationTest() {
         censusEntryCommand.setPersonalOccupation("lower");
-        capitaliseCensusEntry.capitalise(censusEntryCommand);
+        capitaliseCensusEntryCommand.capitalise(censusEntryCommand);
         assertEquals("Lower", censusEntryCommand.getPersonalOccupation());
     }
 
     @Test
     void notesTest() {
         censusEntryCommand.setNotes("lower");
-        capitaliseCensusEntry.capitalise(censusEntryCommand);
+        capitaliseCensusEntryCommand.capitalise(censusEntryCommand);
         assertEquals("Lower", censusEntryCommand.getNotes());
     }
 }

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificatesPartOneTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateCommandPartOneTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.birthcertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -21,9 +21,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseBirthCertificatesPartOneTest {
+class CapitaliseBirthCertificateCommandPartOneTest {
 
-    private CapitaliseBirthCertificate capitaliseBirthCertificate;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -32,7 +32,7 @@ class CapitaliseBirthCertificatesPartOneTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseBirthCertificate = new CapitaliseBirthCertificateImpl(capitaliseStringMock);
+        capitaliseBirthCertificateCommand = new CapitaliseBirthCertificateCommandImpl(capitaliseStringMock);
         birthCertificateCommand = new BirthCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -40,21 +40,21 @@ class CapitaliseBirthCertificatesPartOneTest {
     @Test
     void informantQualificationTest() {
         birthCertificateCommand.setInformantQualification("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getInformantQualification());
     }
 
     @Test
     void untrackedWhereBornTest() {
         birthCertificateCommand.setUntrackedWhereBorn("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getUntrackedWhereBorn());
     }
 
     @Test
     void untrackedFatherTest() {
         birthCertificateCommand.setUntrackedFather("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getUntrackedFather());
     }
 
@@ -62,7 +62,7 @@ class CapitaliseBirthCertificatesPartOneTest {
     @Test
     void untrackedInformantTest() {
         birthCertificateCommand.setUntrackedInformant("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getUntrackedInformant());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificatesPartThreeTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateCommandPartThreeTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.birthcertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -21,9 +21,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseBirthCertificatesPartThreeTest {
+class CapitaliseBirthCertificateCommandPartThreeTest {
 
-    private CapitaliseBirthCertificate capitaliseBirthCertificate;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -32,7 +32,7 @@ class CapitaliseBirthCertificatesPartThreeTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseBirthCertificate = new CapitaliseBirthCertificateImpl(capitaliseStringMock);
+        capitaliseBirthCertificateCommand = new CapitaliseBirthCertificateCommandImpl(capitaliseStringMock);
         birthCertificateCommand = new BirthCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -40,14 +40,14 @@ class CapitaliseBirthCertificatesPartThreeTest {
     @Test
     void motherPlaceOfBirthTest() {
         birthCertificateCommand.setMotherPlaceOfBirth("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getMotherPlaceOfBirth());
     }
 
     @Test
     void fatherPlaceOfBirthTest() {
         birthCertificateCommand.setFatherPlaceOfBirth("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getFatherPlaceOfBirth());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificatesPartTwoTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateCommandPartTwoTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.birthcertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -21,9 +21,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseBirthCertificatesPartTwoTest {
+class CapitaliseBirthCertificateCommandPartTwoTest {
 
-    private CapitaliseBirthCertificate capitaliseBirthCertificate;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -32,7 +32,7 @@ class CapitaliseBirthCertificatesPartTwoTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseBirthCertificate = new CapitaliseBirthCertificateImpl(capitaliseStringMock);
+        capitaliseBirthCertificateCommand = new CapitaliseBirthCertificateCommandImpl(capitaliseStringMock);
         birthCertificateCommand = new BirthCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -41,49 +41,49 @@ class CapitaliseBirthCertificatesPartTwoTest {
     @Test
     void whenBornTest() {
         birthCertificateCommand.setWhenBorn("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getWhenBorn());
     }
 
     @Test
     void certificateNumberTest() {
         birthCertificateCommand.setCertificateNumber("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getCertificateNumber());
     }
 
     @Test
     void whereRegisteredTest() {
         birthCertificateCommand.setWhereRegistered("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getWhereRegistered());
     }
 
     @Test
     void fatherRankTest() {
         birthCertificateCommand.setFatherRank("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getFatherRank());
     }
 
     @Test
     void dateAndPlaceOfMarriageTest() {
         birthCertificateCommand.setDateAndPlaceOfMarriage("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getDateAndPlaceOfMarriage());
     }
 
     @Test
     void unformattedFatherUsualResidenceTest() {
         birthCertificateCommand.setUntrackedFatherUsualResidence("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getUntrackedFatherUsualResidence());
     }
 
     @Test
     void informantResidenceTest() {
         birthCertificateCommand.setInformantResidence("lower");
-        capitaliseBirthCertificate.capitalise(birthCertificateCommand);
+        capitaliseBirthCertificateCommand.capitalise(birthCertificateCommand);
         assertEquals("Lower", birthCertificateCommand.getInformantResidence());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificatesPartOneTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificate/CapitaliseDeathCertificateCommandPartOneTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.deathcertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.deathcertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -12,6 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommand;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 
@@ -21,9 +23,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseDeathCertificatesPartOneTest {
+class CapitaliseDeathCertificateCommandPartOneTest {
 
-    private CapitaliseDeathCertificate capitaliseDeathCertificate;
+    private CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -32,7 +34,7 @@ class CapitaliseDeathCertificatesPartOneTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseDeathCertificate = new CapitaliseDeathCertificateImpl(capitaliseStringMock);
+        capitaliseDeathCertificateCommand = new CapitaliseDeathCertificateCommandImpl(capitaliseStringMock);
         deathCertificateCommand = new DeathCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -40,35 +42,35 @@ class CapitaliseDeathCertificatesPartOneTest {
     @Test
     void informantQualificationTest() {
         deathCertificateCommand.setInformantQualification("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getInformantQualification());
     }
 
     @Test
     void untrackedWhereBornTest() {
         deathCertificateCommand.setUntrackedWhereDied("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getUntrackedWhereDied());
     }
 
     @Test
     void untrackedFatherTest() {
         deathCertificateCommand.setUntrackedFather("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getUntrackedFather());
     }
 
     @Test
     void untrackedMotherTest() {
         deathCertificateCommand.setUntrackedMother("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getUntrackedMother());
     }
 
     @Test
     void untrackedInformantTest() {
         deathCertificateCommand.setUntrackedInformant("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getUntrackedInformant());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificatesPartThreeTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificate/CapitaliseDeathCertificateCommandPartThreeTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.deathcertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.deathcertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -12,6 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommand;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 
@@ -21,10 +23,10 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseDeathCertificatesPartThreeTest {
+class CapitaliseDeathCertificateCommandPartThreeTest {
 
     @SuppressWarnings("unused")
-    private CapitaliseDeathCertificate capitaliseDeathCertificate;
+    private CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -33,7 +35,7 @@ class CapitaliseDeathCertificatesPartThreeTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseDeathCertificate = new CapitaliseDeathCertificateImpl(capitaliseStringMock);
+        capitaliseDeathCertificateCommand = new CapitaliseDeathCertificateCommandImpl(capitaliseStringMock);
         deathCertificateCommand = new DeathCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -41,21 +43,21 @@ class CapitaliseDeathCertificatesPartThreeTest {
     @Test
     void spouseOccupationTest() {
         deathCertificateCommand.setSpouseOccupation("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getSpouseOccupation());
     }
 
     @Test
     void fatherOccupationTest() {
         deathCertificateCommand.setFatherOccupation("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getFatherOccupation());
     }
 
     @Test
     void motherOccupationTest() {
         deathCertificateCommand.setMotherOccupation("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getMotherOccupation());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificates/CapitaliseDeathCertificatesPartTwoTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificate/CapitaliseDeathCertificateCommandPartTwoTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.deathcertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.deathcertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -12,6 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommand;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 
@@ -21,9 +23,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseDeathCertificatesPartTwoTest {
+class CapitaliseDeathCertificateCommandPartTwoTest {
 
-    private CapitaliseDeathCertificate capitaliseDeathCertificate;
+    private CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -32,7 +34,7 @@ class CapitaliseDeathCertificatesPartTwoTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseDeathCertificate = new CapitaliseDeathCertificateImpl(capitaliseStringMock);
+        capitaliseDeathCertificateCommand = new CapitaliseDeathCertificateCommandImpl(capitaliseStringMock);
         deathCertificateCommand = new DeathCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -41,35 +43,35 @@ class CapitaliseDeathCertificatesPartTwoTest {
     @Test
     void whenBornTest() {
         deathCertificateCommand.setWhenBorn("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getWhenBorn());
     }
 
     @Test
     void certificateNumberTest() {
         deathCertificateCommand.setCertificateNumber("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getCertificateNumber());
     }
 
     @Test
     void whereRegisteredTest() {
         deathCertificateCommand.setWhereRegistered("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getWhereRegistered());
     }
 
     @Test
     void occupationTest() {
         deathCertificateCommand.setOccupation("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getOccupation());
     }
 
     @Test
     void untrackedUsualResidenceTest() {
         deathCertificateCommand.setUntrackedUsualResidence("lower");
-        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
+        capitaliseDeathCertificateCommand.capitalise(deathCertificateCommand);
         assertEquals("Lower", deathCertificateCommand.getUntrackedUsualResidence());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificatesPartOneTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificate/CapitaliseMarriageCertificateCommandPartOneTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -12,6 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 
@@ -22,9 +24,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseMarriageCertificatesPartOneTest {
+class CapitaliseMarriageCertificateCommandPartOneTest {
 
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificate;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -33,7 +35,7 @@ class CapitaliseMarriageCertificatesPartOneTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseMarriageCertificate = new CapitaliseMarriageCertificateImpl(capitaliseStringMock);
+        capitaliseMarriageCertificateCommand = new CapitaliseMarriageCertificateCommandImpl(capitaliseStringMock);
         marriageCertificateCommand = new MarriageCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -41,49 +43,49 @@ class CapitaliseMarriageCertificatesPartOneTest {
     @Test
     void untrackedFirstWitnessTest() {
         marriageCertificateCommand.setUntrackedFirstWitness("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getUntrackedFirstWitness());
     }
 
     @Test
     void untrackedSecondWitnessTest() {
         marriageCertificateCommand.setUntrackedSecondWitness("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getUntrackedSecondWitness());
     }
 
     @Test
     void untrackedWhereMarriedTest() {
         marriageCertificateCommand.setUntrackedWhereMarried("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getUntrackedWhereMarried());
     }
 
     @Test
     void groomUntrackedResidenceTest() {
         marriageCertificateCommand.setGroomUntrackedResidence("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getGroomUntrackedResidence());
     }
 
     @Test
     void brideUntrackedResidenceTest() {
         marriageCertificateCommand.setBrideUntrackedResidence("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getBrideUntrackedResidence());
     }
 
     @Test
     void groomUntrackedFatherTest() {
         marriageCertificateCommand.setGroomUntrackedFather("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getGroomUntrackedFather());
     }
 
     @Test
     void brideUntrackedFatherTest() {
         marriageCertificateCommand.setBrideUntrackedFather("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getBrideUntrackedFather());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificatesPartThreeTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificate/CapitaliseMarriageCertificateCommandPartThreeTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -12,6 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 
@@ -21,9 +23,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseMarriageCertificatesPartThreeTest {
+class CapitaliseMarriageCertificateCommandPartThreeTest {
 
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificate;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -32,7 +34,7 @@ class CapitaliseMarriageCertificatesPartThreeTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseMarriageCertificate = new CapitaliseMarriageCertificateImpl(capitaliseStringMock);
+        capitaliseMarriageCertificateCommand = new CapitaliseMarriageCertificateCommandImpl(capitaliseStringMock);
         marriageCertificateCommand = new MarriageCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -40,28 +42,28 @@ class CapitaliseMarriageCertificatesPartThreeTest {
     @Test
     void brideRankTest() {
         marriageCertificateCommand.setBrideRank("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getBrideRank());
     }
 
     @Test
     void groomRankTest() {
         marriageCertificateCommand.setGroomRank("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getGroomRank());
     }
 
     @Test
     void groomFatherRankTest() {
         marriageCertificateCommand.setGroomFatherRank("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getGroomFatherRank());
     }
 
     @Test
     void brideFatherRankTest() {
         marriageCertificateCommand.setBrideFatherRank("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getBrideFatherRank());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificates/CapitaliseMarriageCertificatesPartTwoTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificate/CapitaliseMarriageCertificateCommandPartTwoTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates;
+package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -12,6 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 
@@ -21,9 +23,9 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitaliseMarriageCertificatesPartTwoTest {
+class CapitaliseMarriageCertificateCommandPartTwoTest {
 
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificate;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommand;
 
     @Mock
     private CapitaliseStringImpl capitaliseStringMock;
@@ -32,7 +34,7 @@ class CapitaliseMarriageCertificatesPartTwoTest {
 
     @BeforeEach
     void setUp() {
-        capitaliseMarriageCertificate = new CapitaliseMarriageCertificateImpl(capitaliseStringMock);
+        capitaliseMarriageCertificateCommand = new CapitaliseMarriageCertificateCommandImpl(capitaliseStringMock);
         marriageCertificateCommand = new MarriageCertificateCommandImpl();
         when(capitaliseStringMock.capitalise(any())).thenReturn("Lower");
     }
@@ -40,21 +42,21 @@ class CapitaliseMarriageCertificatesPartTwoTest {
     @Test
     void certificateNumberTest() {
         marriageCertificateCommand.setCertificateNumber("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getCertificateNumber());
     }
 
     @Test
     void volumeTest() {
         marriageCertificateCommand.setVolume("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getVolume());
     }
 
     @Test
     void numberTest() {
         marriageCertificateCommand.setNumber("lower");
-        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
+        capitaliseMarriageCertificateCommand.capitalise(marriageCertificateCommand);
         assertEquals("Lower", marriageCertificateCommand.getNumber());
     }
 

src/test/java/scot/carricksoftware/grants/capitalisation/images/appendixImage/CapitaliseAppendixImageCommandTest.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.capitalisation.images.appendixImage;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grants.capitalisation.CapitaliseString;
+import scot.carricksoftware.grants.capitalisation.images.appendiximage.CapitaliseAppendixImageCommand;
+import scot.carricksoftware.grants.capitalisation.images.appendiximage.CapitaliseAppendixImageCommandImpl;
+import scot.carricksoftware.grants.commands.images.AppendixImageCommand;
+import scot.carricksoftware.grants.commands.images.AppendixImageCommandImpl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+
+@ExtendWith(MockitoExtension.class)
+class CapitaliseAppendixImageCommandTest {
+
+    private CapitaliseAppendixImageCommand capitaliseAppendixImageCommand;
+
+    @Mock
+    CapitaliseString capitaliseStringMock;
+
+    @BeforeEach
+    void setUp() {
+        capitaliseAppendixImageCommand = new CapitaliseAppendixImageCommandImpl(capitaliseStringMock);
+    }
+
+    @Test
+    void capitaliseCaptionTest() {
+        String lower = "lower";
+        AppendixImageCommand appendixImageCommand = new AppendixImageCommandImpl();
+        appendixImageCommand.setCaption(lower);
+
+        when(capitaliseStringMock.capitalise(lower)).thenReturn("Upper");
+
+        capitaliseAppendixImageCommand.capitalise(appendixImageCommand);
+        assertEquals("Upper",appendixImageCommand.getCaption());
+    }
+}

src/test/java/scot/carricksoftware/grants/capitalisation/images/personimages/CapitalisePersonImageTest.java → src/test/java/scot/carricksoftware/grants/capitalisation/images/personimage/CapitalisePersonImageCommandTest.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grants.capitalisation.images.personimages;
+package scot.carricksoftware.grants.capitalisation.images.personimage;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -19,16 +19,16 @@ import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
-class CapitalisePersonImageTest {
+class CapitalisePersonImageCommandTest {
 
-    private CapitalisePersonImage capitalisePersonImage;
+    private CapitalisePersonImageCommand capitalisePersonImageCommand;
 
     @Mock
     CapitaliseString capitaliseStringMock;
 
     @BeforeEach
     void setUp() {
-        capitalisePersonImage = new CapitalisePersonImageImpl(capitaliseStringMock);
+        capitalisePersonImageCommand = new CapitalisePersonImageCommandImpl(capitaliseStringMock);
     }
 
     @Test
@@ -39,7 +39,7 @@ class CapitalisePersonImageTest {
 
         when(capitaliseStringMock.capitalise(lower)).thenReturn("Upper");
 
-        capitalisePersonImage.capitalise(personImageCommand);
+        capitalisePersonImageCommand.capitalise(personImageCommand);
         assertEquals("Upper",personImageCommand.getCaption());
     }
 }

src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerCapitalisationAndValidationTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.census.census.CapitaliseCensus;
+import scot.carricksoftware.grants.capitalisation.census.census.CapitaliseCensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommandImpl;
 import scot.carricksoftware.grants.converters.census.CensusConverterImpl;
@@ -38,7 +38,7 @@ public class CensusFormControllerCapitalisationAndValidationTest {
     CensusCommandValidatorImpl censusCommandValidatorImplMock;
 
     @Mock
-    private CapitaliseCensus capitaliseCensusMock;
+    private CapitaliseCensusCommand capitaliseCensusCommandMock;
 
     @Mock
     private CensusConverterImpl censusConverterMock;
@@ -58,7 +58,7 @@ public class CensusFormControllerCapitalisationAndValidationTest {
     public void setUp() {
         censusController = new CensusFormControllerImpl(censusServiceMock,
                 censusCommandValidatorImplMock,
-                capitaliseCensusMock,
+                capitaliseCensusCommandMock,
                 censusConverterMock,
                 placeServiceMock);
         censusCommand = new CensusCommandImpl();
@@ -79,7 +79,7 @@ public class CensusFormControllerCapitalisationAndValidationTest {
         censusCommand.setId(id);
         when(censusServiceMock.saveCensusCommand(any(CensusCommand.class))).thenReturn(censusCommand);
         censusController.saveOrUpdate(censusCommand, bindingResultMock, modelMock);
-        verify(capitaliseCensusMock).capitalise(censusCommand);
+        verify(capitaliseCensusCommandMock).capitalise(censusCommand);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.census.census.CapitaliseCensus;
+import scot.carricksoftware.grants.capitalisation.census.census.CapitaliseCensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommandImpl;
 import scot.carricksoftware.grants.converters.census.CensusConverterImpl;
@@ -38,7 +38,7 @@ public class CensusFormControllerSaveOrUpdateTest {
     CensusCommandValidatorImpl censusCommandValidatorImplMock;
 
     @Mock
-    private CapitaliseCensus capitaliseCensusMock;
+    private CapitaliseCensusCommand capitaliseCensusCommandMock;
 
     @Mock
     private CensusConverterImpl censusConverterMock;
@@ -58,7 +58,7 @@ public class CensusFormControllerSaveOrUpdateTest {
     public void setUp() {
         censusController = new CensusFormControllerImpl(censusServiceMock,
                 censusCommandValidatorImplMock,
-                capitaliseCensusMock,
+                capitaliseCensusCommandMock,
                 censusConverterMock,
                 placeServiceMock);
         censusCommand = new CensusCommandImpl();

src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerTest.java

@@ -13,7 +13,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.census.census.CapitaliseCensus;
+import scot.carricksoftware.grants.capitalisation.census.census.CapitaliseCensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.census.CensusConverterImpl;
@@ -53,13 +53,13 @@ public class CensusFormControllerTest {
     CensusCommandValidatorImpl censusCommandValidatorImplMock;
 
     @Mock
-    CapitaliseCensus capitaliseCensusMock;
+    CapitaliseCensusCommand capitaliseCensusCommandMock;
 
     @BeforeEach
     public void setUp() {
         censusController = new CensusFormControllerImpl(censusServiceMock,
                 censusCommandValidatorImplMock,
-                capitaliseCensusMock,
+                capitaliseCensusCommandMock,
                 censusConverterMock,
                 placeServiceMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerCapitalisationAndValidationTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntry;
+import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommandImpl;
 import scot.carricksoftware.grants.converters.census.CensusEntryConverterImpl;
@@ -43,7 +43,7 @@ public class CensusEntryFormControllerCapitalisationAndValidationTest {
     private CensusEntryConverterImpl censusEntryConverterMock;
 
     @Mock
-    private CapitaliseCensusEntry capitaliseCensusEntryMock;
+    private CapitaliseCensusEntryCommand capitaliseCensusEntryCommandMock;
 
     @Mock
     private PersonService personServiceMock;
@@ -67,7 +67,7 @@ public class CensusEntryFormControllerCapitalisationAndValidationTest {
         censusEntryController = new CensusEntryFormControllerImpl(censusEntryServiceMock,
                 censusEntryCommandValidatorImplMock,
                 censusEntryConverterMock,
-                capitaliseCensusEntryMock,
+                capitaliseCensusEntryCommandMock,
                 personServiceMock,
                 censusServiceMock,
                 updateRecordedYearOfBirthMock);
@@ -89,7 +89,7 @@ public class CensusEntryFormControllerCapitalisationAndValidationTest {
         censusEntryCommand.setId(id);
         when(censusEntryServiceMock.saveCensusEntryCommand(any(CensusEntryCommand.class))).thenReturn(censusEntryCommand);
         censusEntryController.saveOrUpdate(censusEntryCommand, bindingResultMock, modelMock);
-        verify(capitaliseCensusEntryMock).capitalise(censusEntryCommand);
+        verify(capitaliseCensusEntryCommandMock).capitalise(censusEntryCommand);
     }
 
 }

src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntry;
+import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommandImpl;
 import scot.carricksoftware.grants.converters.census.CensusEntryConverterImpl;
@@ -43,7 +43,7 @@ public class CensusEntryFormControllerSaveOrUpdateTest {
     private CensusEntryConverterImpl censusEntryConverterMock;
 
     @Mock
-    private CapitaliseCensusEntry capitaliseCensusEntryMock;
+    private CapitaliseCensusEntryCommand capitaliseCensusEntryCommandMock;
 
     @Mock
     private PersonService personServiceMock;
@@ -67,7 +67,7 @@ public class CensusEntryFormControllerSaveOrUpdateTest {
         censusEntryController = new CensusEntryFormControllerImpl(censusEntryServiceMock,
                 censusEntryCommandValidatorImplMock,
                 censusEntryConverterMock,
-                capitaliseCensusEntryMock,
+                capitaliseCensusEntryCommandMock,
                 personServiceMock,
                 censusServiceMock,
                 updateRecordedYearOfBirthMock);

src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerTest.java

@@ -13,7 +13,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntry;
+import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.census.CensusEntryConverterImpl;
@@ -55,7 +55,7 @@ public class CensusEntryFormControllerTest {
     private CensusEntryCommandValidatorImpl censusEntryCommandValidatorImplMock;
 
     @Mock
-    private CapitaliseCensusEntry capitaliseCensusEntryMock;
+    private CapitaliseCensusEntryCommand capitaliseCensusEntryCommandMock;
 
     @Mock
     private PersonService personServiceMock;
@@ -69,7 +69,7 @@ public class CensusEntryFormControllerTest {
         censusEntryController = new CensusEntryFormControllerImpl(censusEntryServiceMock,
                 censusEntryCommandValidatorImplMock,
                 censusEntryConverterMock,
-                capitaliseCensusEntryMock,
+                capitaliseCensusEntryCommandMock,
                 personServiceMock,
                 censusServiceMock,
                 updateRecordedYearOfBirthMock);

src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerUpdateRecordedBirthDateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntry;
+import scot.carricksoftware.grants.capitalisation.census.censusentry.CapitaliseCensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommandImpl;
 import scot.carricksoftware.grants.converters.census.CensusEntryConverterImpl;
@@ -43,7 +43,7 @@ public class CensusEntryFormControllerUpdateRecordedBirthDateTest {
     private CensusEntryConverterImpl censusEntryConverterMock;
 
     @Mock
-    private CapitaliseCensusEntry capitaliseCensusEntryMock;
+    private CapitaliseCensusEntryCommand capitaliseCensusEntryCommandMock;
 
     @Mock
     private PersonService personServiceMock;
@@ -67,7 +67,7 @@ public class CensusEntryFormControllerUpdateRecordedBirthDateTest {
         censusEntryController = new CensusEntryFormControllerImpl(censusEntryServiceMock,
                 censusEntryCommandValidatorImplMock,
                 censusEntryConverterMock,
-                capitaliseCensusEntryMock,
+                capitaliseCensusEntryCommandMock,
                 personServiceMock,
                 censusServiceMock,
                 updateRecordedYearOfBirthMock);

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerAttributesTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
@@ -48,7 +48,7 @@ public class BirthCertificateFormControllerAttributesTest {
     private Model modelMock;
 
     @Mock
-    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommandMock;
 
     @Mock
     private AddAttributes addAttributesMock;
@@ -72,7 +72,7 @@ public class BirthCertificateFormControllerAttributesTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                capitaliseBirthCertificateMock,
+                capitaliseBirthCertificateCommandMock,
                 updateCertifiedYearOfBirthMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerCapitalisationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -47,7 +47,7 @@ public class BirthCertificateFormControllerCapitalisationTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommandMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
@@ -68,7 +68,7 @@ public class BirthCertificateFormControllerCapitalisationTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                capitaliseBirthCertificateMock,
+                capitaliseBirthCertificateCommandMock,
                 updateCertifiedYearOfBirthMock,
                 addAttributesMock);
     }
@@ -83,7 +83,7 @@ public class BirthCertificateFormControllerCapitalisationTest {
 
         birthCertificateController.saveOrUpdate(birthCertificateCommand, bindingResultMock, modelMock);
 
-        verify(capitaliseBirthCertificateMock).capitalise(birthCertificateCommand);
+        verify(capitaliseBirthCertificateCommandMock).capitalise(birthCertificateCommand);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -44,7 +44,7 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
     private BirthCertificateConverterImpl birthCertificateConverterMock;
 
     @Mock
-    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommandMock;
 
     @Mock
     Model modelMock;
@@ -70,7 +70,7 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                capitaliseBirthCertificateMock,
+                capitaliseBirthCertificateCommandMock,
                 updateCertifiedYearOfBirthMock,
                 addAttributesMock);
         birthCertificateCommand = new BirthCertificateCommandImpl();
@@ -97,7 +97,7 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
         when(birthCertificateServiceMock.saveBirthCertificateCommand(any(BirthCertificateCommand.class))).thenReturn(birthCertificateCommand);
         birthCertificateCommand.setId(4L);
         birthCertificateController.saveOrUpdate(birthCertificateCommand, bindingResultMock, modelMock);
-        verify(capitaliseBirthCertificateMock).capitalise(birthCertificateCommand);
+        verify(capitaliseBirthCertificateCommandMock).capitalise(birthCertificateCommand);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerTest.java

@@ -12,7 +12,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -50,7 +50,7 @@ public class BirthCertificateFormControllerTest {
     private Model modelMock;
 
     @Mock
-    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommandMock;
 
     @Mock
     private AddAttributes addAttributesMock;
@@ -68,7 +68,7 @@ public class BirthCertificateFormControllerTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                capitaliseBirthCertificateMock,
+                capitaliseBirthCertificateCommandMock,
                 updateCertifiedYearOfBirthMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerUpdateTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -47,7 +47,7 @@ public class BirthCertificateFormControllerUpdateTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommandMock;
 
     @Mock
     private AddAttributes addAttributesMock;
@@ -68,7 +68,7 @@ public class BirthCertificateFormControllerUpdateTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                capitaliseBirthCertificateMock,
+                capitaliseBirthCertificateCommandMock,
                 updateCertifiedYearOfBirthMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerValidationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -47,7 +47,7 @@ public class BirthCertificateFormControllerValidationTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
+    private CapitaliseBirthCertificateCommand capitaliseBirthCertificateCommandMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
@@ -68,7 +68,7 @@ public class BirthCertificateFormControllerValidationTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                capitaliseBirthCertificateMock,
+                capitaliseBirthCertificateCommandMock,
                 updateCertifiedYearOfBirthMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerAttributesTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.deathcertificates.DeathCertificateCommandConverterImpl;
@@ -48,7 +48,7 @@ public class DeathCertificateFormControllerAttributesTest {
     private Model modelMock;
 
     @Mock
-    private CapitaliseDeathCertificate capitaliseDeathCertificateMock;
+    private CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommandMock;
 
     @Mock
     private AddAttributes addAttributesMock;
@@ -72,7 +72,7 @@ public class DeathCertificateFormControllerAttributesTest {
                 deathCertificateCommandConverterMock,
                 deathCertificateConverterMock,
                 deathCertificateCommandValidatorImplMock,
-                capitaliseDeathCertificateMock,
+                capitaliseDeathCertificateCommandMock,
                 updateCertifiedYearOfDeathMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -53,7 +53,7 @@ public class DeathCertificateFormControllerSaveOrUpdateTest {
     BindingResult bindingResultMock;
 
     @Mock
-    CapitaliseDeathCertificate capitaliseDeathCertificateMock;
+    CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommandMock;
 
     @Mock
     AddAttributes addAttributesMock;
@@ -70,7 +70,7 @@ public class DeathCertificateFormControllerSaveOrUpdateTest {
                 deathCertificateCommandConverterMock,
                 deathCertificateConverterMock,
                 deathCertificateCommandValidatorMock,
-                capitaliseDeathCertificateMock,
+                capitaliseDeathCertificateCommandMock,
                 updateCertifiedYearOfDeathMock,
                 addAttributesMock);
         deathCertificateCommand = new DeathCertificateCommandImpl();
@@ -97,7 +97,7 @@ public class DeathCertificateFormControllerSaveOrUpdateTest {
         when(deathCertificateServiceMock.saveDeathCertificateCommand(any(DeathCertificateCommand.class))).thenReturn(deathCertificateCommand);
         deathCertificateCommand.setId(4L);
         deathCertificateController.saveOrUpdate(deathCertificateCommand, bindingResultMock, modelMock);
-        verify(capitaliseDeathCertificateMock).capitalise(deathCertificateCommand);
+        verify(capitaliseDeathCertificateCommandMock).capitalise(deathCertificateCommand);
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerTest.java

@@ -12,7 +12,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -52,7 +52,7 @@ public class DeathCertificateFormControllerTest {
     private DeathCertificateCommandValidator deathCertificateCommandValidatorMock;
 
     @Mock
-    CapitaliseDeathCertificate capitaliseDeathCertificateMock;
+    CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommandMock;
 
     @Mock
     private UpdateCertifiedYearOfDeath updateCertifiedYearOfDeathMock;
@@ -67,7 +67,7 @@ public class DeathCertificateFormControllerTest {
                 deathCertificateCommandConverterMock,
                 deathCertificateConverterMock,
                 deathCertificateCommandValidatorMock,
-                capitaliseDeathCertificateMock,
+                capitaliseDeathCertificateCommandMock,
                 updateCertifiedYearOfDeathMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerValidationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificates.CapitaliseDeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -60,7 +60,7 @@ public class DeathCertificateFormControllerValidationTest {
     private AddAttributes addAttributesMock;
 
     @Mock
-    CapitaliseDeathCertificate capitaliseDeathCertificateMock;
+    CapitaliseDeathCertificateCommand capitaliseDeathCertificateCommandMock;
 
 
     @BeforeEach
@@ -69,7 +69,7 @@ public class DeathCertificateFormControllerValidationTest {
                 deathCertificateCommandConverterMock,
                 deathCertificateConverterMock,
                 deathCertificateCommandValidatorMock,
-                capitaliseDeathCertificateMock,
+                capitaliseDeathCertificateCommandMock,
                 updateCertifiedYearOfDeathMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerAttributesTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
@@ -48,7 +48,7 @@ public class MarriageCertificateFormControllerAttributesTest {
     private Model modelMock;
 
     @Mock
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommandMock;
 
     @Mock
     private AddAttributes addAttributesMock;
@@ -72,7 +72,7 @@ public class MarriageCertificateFormControllerAttributesTest {
                 marriageCertificateCommandConverterMock,
                 marriageCertificateConverterMock,
                 marriageCertificateCommandValidatorImplMock,
-                capitaliseMarriageCertificateMock,
+                capitaliseMarriageCertificateCommandMock,
                 setYearMarriedMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerCapitalisationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -47,7 +47,7 @@ public class MarriageCertificateFormControllerCapitalisationTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommandMock;
 
     @Mock
     private MarriageCertificateCommandValidator marriageCertificateCommandValidatorMock;
@@ -68,7 +68,7 @@ public class MarriageCertificateFormControllerCapitalisationTest {
                 marriageCertificateCommandConverterMock,
                 marriageCertificateConverterMock,
                 marriageCertificateCommandValidatorMock,
-                capitaliseMarriageCertificateMock,
+                capitaliseMarriageCertificateCommandMock,
                 setYearMarriedMock,
                 addAttributesMock);
     }
@@ -83,7 +83,7 @@ public class MarriageCertificateFormControllerCapitalisationTest {
 
         marriageCertificateController.saveOrUpdate(marriageCertificateCommand, bindingResultMock, modelMock);
 
-        verify(capitaliseMarriageCertificateMock).capitalise(marriageCertificateCommand);
+        verify(capitaliseMarriageCertificateCommandMock).capitalise(marriageCertificateCommand);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -43,7 +43,7 @@ public class MarriageCertificateFormControllerSaveOrUpdateTest {
     private MarriageCertificateConverterImpl marriageCertificateConverterMock;
 
     @Mock
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommandMock;
 
     @Mock
     private SetYearMarried setYearMarriedMock;
@@ -69,7 +69,7 @@ public class MarriageCertificateFormControllerSaveOrUpdateTest {
                 marriageCertificateCommandConverterMock,
                 marriageCertificateConverterMock,
                 marriageCertificateCommandValidatorMock,
-                capitaliseMarriageCertificateMock,
+                capitaliseMarriageCertificateCommandMock,
                 setYearMarriedMock,
                 addAttributesMock);
         marriageCertificateCommand = new MarriageCertificateCommandImpl();

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerSetDatesTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -47,7 +47,7 @@ public class MarriageCertificateFormControllerSetDatesTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommandMock;
 
     @Mock
     private MarriageCertificateCommandValidator marriageCertificateCommandValidatorMock;
@@ -68,7 +68,7 @@ public class MarriageCertificateFormControllerSetDatesTest {
                 marriageCertificateCommandConverterMock,
                 marriageCertificateConverterMock,
                 marriageCertificateCommandValidatorMock,
-                capitaliseMarriageCertificateMock,
+                capitaliseMarriageCertificateCommandMock,
                 setYearMarriedMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerTest.java

@@ -12,7 +12,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -45,7 +45,7 @@ public class MarriageCertificateFormControllerTest {
     private MarriageCertificateConverterImpl marriageCertificateConverterMock;
 
     @Mock
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommandMock;
 
     @Mock
     private SetYearMarried setYearMarriedMock;
@@ -66,7 +66,7 @@ public class MarriageCertificateFormControllerTest {
                 marriageCertificateCommandConverterMock,
                 marriageCertificateConverterMock,
                 marriageCertificateCommandValidatorMock,
-                capitaliseMarriageCertificateMock,
+                capitaliseMarriageCertificateCommandMock,
                 setYearMarriedMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerValidationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificate;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificates.CapitaliseMarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.controllers.attributes.AddAttributes;
@@ -47,7 +47,7 @@ public class MarriageCertificateFormControllerValidationTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
+    private CapitaliseMarriageCertificateCommand capitaliseMarriageCertificateCommandMock;
 
     @Mock
     private MarriageCertificateCommandValidator marriageCertificateCommandValidatorMock;
@@ -68,7 +68,7 @@ public class MarriageCertificateFormControllerValidationTest {
                 marriageCertificateCommandConverterMock,
                 marriageCertificateConverterMock,
                 marriageCertificateCommandValidatorMock,
-                capitaliseMarriageCertificateMock,
+                capitaliseMarriageCertificateCommandMock,
                 setYearMarriedMock,
                 addAttributesMock);
     }

src/test/java/scot/carricksoftware/grants/controllers/images/personimages/PersonImageFormControllerSaveOrUpdateTest.java

@@ -12,7 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.images.personimages.CapitalisePersonImage;
+import scot.carricksoftware.grants.capitalisation.images.personimage.CapitalisePersonImageCommand;
 import scot.carricksoftware.grants.commands.images.PersonImageCommand;
 import scot.carricksoftware.grants.commands.images.PersonImageCommandImpl;
 import scot.carricksoftware.grants.controllers.images.personImages.PersonImageFormControllerImpl;
@@ -50,7 +50,7 @@ public class PersonImageFormControllerSaveOrUpdateTest {
     private ImageService imageServiceMock;
 
     @Mock
-    private CapitalisePersonImage capitalisePersonImageMock;
+    private CapitalisePersonImageCommand capitalisePersonImageCommandMock;
 
     @Mock
     Model modelMock;
@@ -72,7 +72,7 @@ public class PersonImageFormControllerSaveOrUpdateTest {
                 personImageCommandValidatorImplMock,
                 personServiceMock,
                 imageServiceMock,
-                capitalisePersonImageMock);
+                capitalisePersonImageCommandMock);
         personImageCommand = new PersonImageCommandImpl();
     }
 

src/test/java/scot/carricksoftware/grants/controllers/images/personimages/PersonImageFormControllerTest.java

@@ -13,7 +13,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.capitalisation.images.personimages.CapitalisePersonImage;
+import scot.carricksoftware.grants.capitalisation.images.personimage.CapitalisePersonImageCommand;
 import scot.carricksoftware.grants.commands.images.PersonImageCommand;
 import scot.carricksoftware.grants.constants.ImageAttributeConstants;
 import scot.carricksoftware.grants.controllers.images.personImages.PersonImageFormControllerImpl;
@@ -60,7 +60,7 @@ public class PersonImageFormControllerTest {
     private ImageService imageServiceMock;
 
     @Mock
-    private CapitalisePersonImage capitalisePersonImageMock;
+    private CapitalisePersonImageCommand capitalisePersonImageCommandMock;
 
 
     @BeforeEach
@@ -71,7 +71,7 @@ public class PersonImageFormControllerTest {
                 personImageCommandValidatorImplMock,
                 personServiceMock,
                 imageServiceMock,
-                capitalisePersonImageMock);
+                capitalisePersonImageCommandMock);
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/controllers/images/personimages/PersonImageFormControllerValidationTest.java

@@ -13,7 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
-import scot.carricksoftware.grants.capitalisation.images.personimages.CapitalisePersonImage;
+import scot.carricksoftware.grants.capitalisation.images.personimage.CapitalisePersonImageCommand;
 import scot.carricksoftware.grants.commands.images.PersonImageCommand;
 import scot.carricksoftware.grants.controllers.images.personImages.PersonImageFormControllerImpl;
 import scot.carricksoftware.grants.converters.images.personimage.PersonImageCommandConverterImpl;
@@ -60,7 +60,7 @@ public class PersonImageFormControllerValidationTest {
     private PersonImageCommandValidatorImpl personImageCommandValidatorImplMock;
 
     @Mock
-    private CapitalisePersonImage capitalisePersonImageMock;
+    private CapitalisePersonImageCommand capitalisePersonImageCommandMock;
 
     @Mock
     Model modelMock;
@@ -74,7 +74,7 @@ public class PersonImageFormControllerValidationTest {
                 personImageCommandValidatorImplMock,
                 personServiceMocK,
                 imageServiceMocK,
-                capitalisePersonImageMock);
+                capitalisePersonImageCommandMock);
     }
 
 
@@ -89,7 +89,7 @@ public class PersonImageFormControllerValidationTest {
     public void saveOrUpdateCapitalisationTest() {
         when(personImageServiceMock.savePersonImageCommand(any())).thenReturn(personImageCommandMock);
         personImageController.saveOrUpdate(personImageCommandMock, bindingResultMock, modelMock);
-        verify(capitalisePersonImageMock).capitalise(personImageCommandMock);
+        verify(capitalisePersonImageCommandMock).capitalise(personImageCommandMock);
     }
 
 }