diff --git a/dspace-sword-client/dspace-sword-client-api/src/main/java/org/dspace/sword/client/ServiceDocumentHelper.java b/dspace-sword-client/dspace-sword-client-api/src/main/java/org/dspace/sword/client/ServiceDocumentHelper.java
index b93ed55fdf..ea13f18d94 100644
--- a/dspace-sword-client/dspace-sword-client-api/src/main/java/org/dspace/sword/client/ServiceDocumentHelper.java
+++ b/dspace-sword-client/dspace-sword-client-api/src/main/java/org/dspace/sword/client/ServiceDocumentHelper.java
@@ -56,7 +56,7 @@ public class ServiceDocumentHelper {
 
     public static String[] getCommonFileTypes(ServiceDocument serviceDoc, String location)
     {
-        String FTsString = ConfigurationManager.getProperty("sword-client", "sword-client.file-types");
+        String FTsString = ConfigurationManager.getProperty("sword-client", "file-types");
         String[] clientFTsArray = FTsString.split(",");
         List<String> clientFTs = Arrays.asList(clientFTsArray);
 
@@ -77,7 +77,7 @@ public class ServiceDocumentHelper {
 
     public static String[] getCommonPackageFormats(ServiceDocument serviceDoc, String location)
     {
-        String PFsString = ConfigurationManager.getProperty("sword-client", "sword-client.package-formats");
+        String PFsString = ConfigurationManager.getProperty("sword-client", "package-formats");
         String[] clientPFsArray = PFsString.split(",");
         List<String> clientPFs = Arrays.asList(clientPFsArray);
 
diff --git a/dspace-sword-client/dspace-sword-client-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/swordclient/SelectTargetTransformer.java b/dspace-sword-client/dspace-sword-client-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/swordclient/SelectTargetTransformer.java
index c8a6fdaf40..2e9b09407d 100644
--- a/dspace-sword-client/dspace-sword-client-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/swordclient/SelectTargetTransformer.java
+++ b/dspace-sword-client/dspace-sword-client-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/swordclient/SelectTargetTransformer.java
@@ -95,7 +95,7 @@ public class SelectTargetTransformer extends AbstractDSpaceTransformer
         List targetDetails = main.addList("target_details",List.TYPE_FORM);
 
         Select source = targetDetails.addItem().addSelect("url");
-        String targetsString = ConfigurationManager.getProperty("sword-client", "sword-client.targets");
+        String targetsString = ConfigurationManager.getProperty("sword-client", "targets");
         String[] targets = targetsString.split(",");
         for (String target : targets)
         {
diff --git a/dspace/config/modules/sword-client.cfg b/dspace/config/modules/sword-client.cfg
index 53956a5979..a833da22ee 100644
--- a/dspace/config/modules/sword-client.cfg
+++ b/dspace/config/modules/sword-client.cfg
@@ -1,15 +1,15 @@
 # List of remote Sword servers. Used to build the drop-down list of selectable Sword targets.
-sword-client.targets = http://localhost:8080/sword/servicedocument, \
-                       http://client.swordapp.org/client/servicedocument, \
-			           http://dspace.swordapp.org/sword/servicedocument, \
-			           http://sword.eprints.org/sword-app/servicedocument, \
-					   http://sword.intralibrary.com/IntraLibrary-Deposit/service, \
-				       http://fedora.swordapp.org/sword-fedora/servicedocument
+targets = http://localhost:8080/sword/servicedocument, \
+          http://client.swordapp.org/client/servicedocument, \
+          http://dspace.swordapp.org/sword/servicedocument, \
+          http://sword.eprints.org/sword-app/servicedocument, \
+          http://sword.intralibrary.com/IntraLibrary-Deposit/service, \
+		  http://fedora.swordapp.org/sword-fedora/servicedocument
 
 # List of file types from which the user can select. If a type is not supported by the remote server
 # it will not appear in the drop-down list.
-sword-client.file-types = application/zip
+file-types = application/zip
 
 # List of package formats from which the user can select. If a format is not supported by the remote server
 # it will not appear in the drop-down list.
-sword-client.package-formats = http://purl.org/net/sword-types/METSDSpaceSIP
\ No newline at end of file
+package-formats = http://purl.org/net/sword-types/METSDSpaceSIP
\ No newline at end of file