diff --git a/README.md b/README.md
index 3fa24fe6c..dc63ca8af 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ The following are guidelines to follow when contributing:
 3. **lib** contains most of the code.
    a) **server.go** contains the main Server object, which is configured by **serverconfig.go**.
    b) **client.go** contains the main Client object, which is configured by **clientconfig.go**.
-4. **lib/csp** contains some functions related to the Crypto Service Provider.
+4. **util/csp.go** contains the Crypto Service Provider implementation.
 5. **lib/dbutil** contains database utility functions.
 6. **lib/ldap** contains LDAP client code.
 7. **lib/spi** contains Service Provider Interface code for the user registry.
diff --git a/lib/caconfig.go b/lib/caconfig.go
index 263a2bc2e..0237535c1 100644
--- a/lib/caconfig.go
+++ b/lib/caconfig.go
@@ -72,7 +72,7 @@ csr:
 )
 
 // CAConfig is the CA instance's config
-// The tags are recognized by the RegisterFlags function in fabric-ca/lib/util.go
+// The tags are recognized by the RegisterFlags function in fabric-ca/util/flag.go
 // and are as follows:
 // "def" - the default value of the field;
 // "opt" - the optional one character short name to use on the command line;
diff --git a/lib/serverconfig.go b/lib/serverconfig.go
index b8761c42a..1ce4bfb9a 100644
--- a/lib/serverconfig.go
+++ b/lib/serverconfig.go
@@ -27,7 +27,7 @@ const (
 )
 
 // ServerConfig is the fabric-ca server's config
-// The tags are recognized by the RegisterFlags function in fabric-ca/lib/util.go
+// The tags are recognized by the RegisterFlags function in fabric-ca/util/flag.go
 // and are as follows:
 // "def" - the default value of the field;
 // "opt" - the optional one character short name to use on the command line;