diff --git a/make-root-ca-and-certificates.sh b/make-root-ca-and-certificates.sh
index 15c13bd..c2bad2d 100755
--- a/make-root-ca-and-certificates.sh
+++ b/make-root-ca-and-certificates.sh
@@ -24,31 +24,31 @@ openssl req \
 # such as example.com, *.example.com, awesome.example.com
 # NOTE: You MUST match CN to the domain name or ip address you want to use
 openssl genrsa \
-  -out certs/server/my-server.key.pem \
+  -out certs/server/privkey.pem \
   2048
 
 # Create a request from your Device, which your Root CA will sign
 openssl req -new \
-  -key certs/server/my-server.key.pem \
-  -out certs/tmp/my-server.csr.pem \
+  -key certs/server/privkey.pem \
+  -out certs/tmp/csr.pem \
   -subj "/C=US/ST=Utah/L=Provo/O=ACME Tech Inc/CN=${FQDN}"
 
 # Sign the request from Device with your Root CA
 # -CAserial certs/ca/my-root-ca.srl
 openssl x509 \
-  -req -in certs/tmp/my-server.csr.pem \
+  -req -in certs/tmp/csr.pem \
   -CA certs/ca/my-root-ca.crt.pem \
   -CAkey certs/ca/my-root-ca.key.pem \
   -CAcreateserial \
-  -out certs/server/my-server.crt.pem \
+  -out certs/server/cert.pem \
   -days 500
 
 # Create a public key, for funzies
 # see https://gist.github.com/coolaj86/f6f36efce2821dfb046d
 openssl rsa \
-  -in certs/server/my-server.key.pem \
-  -pubout -out certs/client/my-server.pub
+  -in certs/server/privkey.pem \
+  -pubout -out certs/client/pubkey.pem
 
 # Put things in their proper place
-rsync -a certs/ca/my-root-ca.crt.pem certs/server/
-rsync -a certs/ca/my-root-ca.crt.pem certs/client/
+rsync -a certs/ca/my-root-ca.crt.pem certs/server/chain.pem
+rsync -a certs/ca/my-root-ca.crt.pem certs/client/chain.pem