diff --git a/modules/spectoconfig/src/main/java/com/axway/apim/config/GenerateTemplate.java b/modules/spectoconfig/src/main/java/com/axway/apim/config/GenerateTemplate.java
index c2bf21082..d80716b7f 100644
--- a/modules/spectoconfig/src/main/java/com/axway/apim/config/GenerateTemplate.java
+++ b/modules/spectoconfig/src/main/java/com/axway/apim/config/GenerateTemplate.java
@@ -345,10 +345,10 @@ public SecurityProfile createPassThroughSecurityProfile() {
 
     public SecurityProfile createOauthSecurityProfile(String operationId, List<String> scopes) {
         SecurityProfile profile = new SecurityProfile();
-        profile.setName("Oauth2");
+        profile.setName("Oauth2 " + operationId);
         profile.setIsDefault(false);
         SecurityDevice securityDevice = new SecurityDevice();
-        securityDevice.setName("Oauth2 " + operationId);
+        securityDevice.setName("Oauth2");
         securityDevice.setType(DeviceType.oauth);
         securityDevice.setOrder(0);
         Map<String, String> properties = new HashMap<>();