diff --git a/src/ocserv-args.def b/src/ocserv-args.def
index 9f98c6ff..2b839dd2 100644
--- a/src/ocserv-args.def
+++ b/src/ocserv-args.def
@@ -528,7 +528,7 @@ certtool.
 $ certtool --generate-privkey --outfile server-key.pem
 $ cat << _EOF_ >server.tmpl
 cn = "www.example.com"
-o = "MyCompany"
+organization = "MyCompany"
 serial = 2
 expiration_days = 9999
 signing_key
@@ -552,7 +552,7 @@ with the signing_key option and another with the encryption_key.
 $ certtool --generate-privkey --outfile server-key.pem
 $ cat << _EOF_ >server.tmpl
 cn = "www.example.com"
-o = "MyCompany"
+organization = "MyCompany"
 serial = 2
 expiration_days = 9999
 signing_key
@@ -574,7 +574,7 @@ certificate as it is sent in clear during TLS authentication.
 $ certtool --generate-privkey --outfile user-key.pem
 $ cat << _EOF_ >user.tmpl
 cn = "user"
-ou = "admins"
+unit = "admins"
 serial = 1824
 expiration_days = 9999
 signing_key