diff --git a/src/main/java/org/apache/nifi/components/connector/SecretReference.java b/src/main/java/org/apache/nifi/components/connector/SecretReference.java
index d4c29b4..d717ec2 100644
--- a/src/main/java/org/apache/nifi/components/connector/SecretReference.java
+++ b/src/main/java/org/apache/nifi/components/connector/SecretReference.java
@@ -96,6 +96,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "SecretReference[providerId=" + providerId + ", providerName=" + providerName + ", secretName=" + secretName + "]";
+        return "SecretReference[providerId=" + providerId + ", providerName=" + providerName + ", secretName=" + secretName + ", fullyQualifiedName=" + fullyQualifiedName + "]";
     }
 }
diff --git a/src/main/java/org/apache/nifi/parameter/ParameterProvider.java b/src/main/java/org/apache/nifi/parameter/ParameterProvider.java
index c1a6caf..d8cf6ad 100644
--- a/src/main/java/org/apache/nifi/parameter/ParameterProvider.java
+++ b/src/main/java/org/apache/nifi/parameter/ParameterProvider.java
@@ -124,7 +124,8 @@ default List<ParameterGroup> fetchParameters(final ConfigurationContext context,
         for (final ParameterGroup group : allGroups) {
             // Determine which parameter names are desired from this group
             final List<String> desiredParameterNames = new ArrayList<>();
-            final String prefix = group.getGroupName() + ".";
+            final String name = context.getName();
+            final String prefix = name + "." + group.getGroupName() + ".";
             for (final String fullyQualifiedParameterName : fullyQualifiedParameterNames) {
                 if (fullyQualifiedParameterName.startsWith(prefix)) {
                     final String secretName = fullyQualifiedParameterName.substring(prefix.length());