diff --git a/pkg/msp/opts.go b/pkg/msp/opts.go
index f7a398ff65..b2cff96709 100644
--- a/pkg/msp/opts.go
+++ b/pkg/msp/opts.go
@@ -34,22 +34,22 @@ type client interface {
 
 // caConfig interface allows to uniquely override IdentityConfig interface's CAConfig() function
 type caConfig interface {
-	CAConfig(org string) (*msp.CAConfig, bool)
+	CAConfig(caID string) (*msp.CAConfig, bool)
 }
 
 // caServerCerts interface allows to uniquely override IdentityConfig interface's CAServerCerts() function
 type caServerCerts interface {
-	CAServerCerts(org string) ([][]byte, bool)
+	CAServerCerts(caID string) ([][]byte, bool)
 }
 
 // caClientKey interface allows to uniquely override IdentityConfig interface's CAClientKey() function
 type caClientKey interface {
-	CAClientKey(org string) ([]byte, bool)
+	CAClientKey(caID string) ([]byte, bool)
 }
 
 // caClientCert interface allows to uniquely override IdentityConfig interface's CAClientCert() function
 type caClientCert interface {
-	CAClientCert(org string) ([]byte, bool)
+	CAClientCert(caID string) ([]byte, bool)
 }
 
 // caKeyStorePath interface allows to uniquely override IdentityConfig interface's CAKeyStorePath() function
diff --git a/pkg/msp/opts_test.go b/pkg/msp/opts_test.go
index 76b08356c6..d25c24b9d2 100644
--- a/pkg/msp/opts_test.go
+++ b/pkg/msp/opts_test.go
@@ -56,18 +56,18 @@ func TestCreateCustomIdentityConfig(t *testing.T) {
 	require.NotEmpty(t, clnt, "client returned must not be empty")
 
 	// test m2 implementation
-	caCfg, ok := ico.CAConfig("testORG")
+	caCfg, ok := ico.CAConfig("testCA")
 	require.True(t, ok, "CAConfig failed")
 	require.Equal(t, "test.url.com", caCfg.URL, "CAConfig did not return expected interface value")
 
 	// test m3 implementation
-	s, ok := ico.CAServerCerts("testORG")
+	s, ok := ico.CAServerCerts("testCA")
 	require.True(t, ok, "CAServerCerts failed")
 	require.Equal(t, []byte("testCAservercert1"), s[0], "CAServerCerts did not return the right cert")
 	require.Equal(t, []byte("testCAservercert2"), s[1], "CAServerCerts did not return the right cert")
 
 	// test m4 implementation
-	c, ok := ico.CAClientKey("testORG")
+	c, ok := ico.CAClientKey("testCA")
 	require.True(t, ok, "CAClientKey failed")
 	require.Equal(t, []byte("testCAclientkey"), c, "CAClientKey did not return the right cert")
 
@@ -148,18 +148,18 @@ func TestCreateCustomIdentityConfigWithSomeDefaultFunctions(t *testing.T) {
 	require.NotEmpty(t, clnt, "client returned must not be empty")
 
 	// test m2 implementation
-	caCfg, ok := identityConfigOptionWithSomeDefaults.CAConfig("testORG")
+	caCfg, ok := identityConfigOptionWithSomeDefaults.CAConfig("testCA")
 	require.True(t, ok, "CAConfig failed")
 	require.Equal(t, "test.url.com", caCfg.URL, "CAConfig did not return expected interface value")
 
 	// test m3 implementation
-	s, ok := identityConfigOptionWithSomeDefaults.CAServerCerts("testORG")
+	s, ok := identityConfigOptionWithSomeDefaults.CAServerCerts("testCA")
 	require.True(t, ok, "CAServerCerts failed")
 	require.Equal(t, []byte("testCAservercert1"), s[0], "CAServerCerts did not return the right cert")
 	require.Equal(t, []byte("testCAservercert2"), s[1], "CAServerCerts did not return the right cert")
 
 	// test m4 implementation
-	c, ok := identityConfigOptionWithSomeDefaults.CAClientKey("testORG")
+	c, ok := identityConfigOptionWithSomeDefaults.CAClientKey("testCA")
 	require.True(t, ok, "CAClientKey failed")
 	require.Equal(t, []byte("testCAclientkey"), c, "CAClientKey did not return the right cert")