diff --git a/README.md b/README.md
index 7f8acbb..a0c17ad 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Wireguard UI
+# WireGuard UI
 
 [![Build Status](https://badge.buildkite.com/1e96905f9ee8e199808cd7faaf5a8600b2c1820fb30ae7903a.svg)](https://buildkite.com/embark-studios/wireguard-ui)
 [![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](https://github.com/EmbarkStudios)
 [![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
 
-A basic, self-contained management service for Wireguard with a self-serve web UI.
+A basic, self-contained management service for [WireGuard](https://wireguard.com) with a self-serve web UI.
 
 ## Features
 
diff --git a/server.go b/server.go
index d9d2d0a..975247b 100644
--- a/server.go
+++ b/server.go
@@ -36,11 +36,11 @@ var (
 	clientIPRange  = kingpin.Flag("client-ip-range", "Client IP CIDR").Default("172.72.72.1/24").String()
 	authUserHeader = kingpin.Flag("auth-user-header", "Header containing username").Default("X-Forwarded-User").String()
 
-	wgLinkName   = kingpin.Flag("wg-device-name", "Wireguard network device name").Default("wg0").String()
-	wgListenPort = kingpin.Flag("wg-listen-port", "Wireguard UDP port to listen to").Default("51820").Int()
-	wgEndpoint   = kingpin.Flag("wg-endpoint", "Wireguard endpoint address").Default("127.0.0.1:51820").String()
-	wgAllowedIPs = kingpin.Flag("wg-allowed-ips", "Wireguard client allowed ips").Default("0.0.0.0/0").Strings()
-	wgDNS        = kingpin.Flag("wg-dns", "Wireguard client DNS server (optional)").Default("").String()
+	wgLinkName   = kingpin.Flag("wg-device-name", "WireGuard network device name").Default("wg0").String()
+	wgListenPort = kingpin.Flag("wg-listen-port", "WireGuard UDP port to listen to").Default("51820").Int()
+	wgEndpoint   = kingpin.Flag("wg-endpoint", "WireGuard endpoint address").Default("127.0.0.1:51820").String()
+	wgAllowedIPs = kingpin.Flag("wg-allowed-ips", "WireGuard client allowed ips").Default("0.0.0.0/0").Strings()
+	wgDNS        = kingpin.Flag("wg-dns", "WireGuard client DNS server (optional)").Default("").String()
 
 	devUIServer = kingpin.Flag("dev-ui-server", "Developer mode: If specified, proxy all static assets to this endpoint").String()
 )
@@ -122,7 +122,7 @@ func (s *Server) initInterface() error {
 	log.Debug("Adding wireguard device: ", *wgLinkName)
 	err := netlink.LinkAdd(&link)
 	if os.IsExist(err) {
-		log.Infof("Wireguard interface %s already exists. Reusing.", *wgLinkName)
+		log.Infof("WireGuard interface %s already exists. Reusing.", *wgLinkName)
 	} else if err != nil {
 		return err
 	}
@@ -131,7 +131,7 @@ func (s *Server) initInterface() error {
 	addr, _ := netlink.ParseAddr(*clientIPRange)
 	err = netlink.AddrAdd(&link, addr)
 	if os.IsExist(err) {
-		log.Infof("Wireguard interface %s already has the requested address: ", s.clientIPRange)
+		log.Infof("WireGuard interface %s already has the requested address: ", s.clientIPRange)
 	} else if err != nil {
 		return err
 	}
@@ -229,13 +229,13 @@ func (s *Server) reconfigure() {
 		log.Fatal(err)
 	}
 
-	err = s.configureWireguard()
+	err = s.configureWireGuard()
 	if err != nil {
 		log.Fatal(err)
 	}
 }
 
-func (s *Server) configureWireguard() error {
+func (s *Server) configureWireGuard() error {
 	log.Debugf("Reconfiguring wireguard interface %s", *wgLinkName)
 	wg, err := wgctrl.New()
 	if err != nil {
@@ -292,7 +292,7 @@ func (s *Server) Start() error {
 		return err
 	}
 
-	err = s.configureWireguard()
+	err = s.configureWireGuard()
 	if err != nil {
 		return err
 	}
diff --git a/ui/package.json b/ui/package.json
index b6dbf7e..4c93729 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,7 +1,7 @@
 {
     "name": "wireguard-ui",
     "version": "1.0.0",
-    "description": "Wireguard VPN web UI",
+    "description": "WireGuard VPN web UI",
     "main": "index.js",
     "scripts": {
         "dev": "webpack-dev-server --mode=development --open --port 5000",
diff --git a/ui/src/About.svelte b/ui/src/About.svelte
index 21883ee..62f9a71 100644
--- a/ui/src/About.svelte
+++ b/ui/src/About.svelte
@@ -1,7 +1,7 @@
 <h1>About</h1>
 
 <p>
-Wireguard UI is an <a href="https://embark-studios.com/">Embark Studios</a> Open Source project.
+WireGuard UI is an <a href="https://embark-studios.com/">Embark Studios</a> Open Source project.
 </p>
 
 <p>
@@ -11,7 +11,7 @@ For contributions and feedback, please see the
 
 <h2>License</h2>
 <p>
-Wireguard UI is licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
+WireGuard UI is licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
 </p>
 
 <p>Copyright &copy; 2019, Embark Studios AB</p>
diff --git a/ui/src/App.svelte b/ui/src/App.svelte
index b3b012f..fcd156f 100644
--- a/ui/src/App.svelte
+++ b/ui/src/App.svelte
@@ -1,5 +1,5 @@
 <svelte:head>
-  <title>Wireguard VPN</title>
+  <title>WireGuard VPN</title>
 </svelte:head>
 
 <script>
diff --git a/ui/src/Nav.svelte b/ui/src/Nav.svelte
index 2eb3b71..d6c04e5 100644
--- a/ui/src/Nav.svelte
+++ b/ui/src/Nav.svelte
@@ -19,7 +19,7 @@
 <TopAppBar variant="static" color="primary">
   <Row>
     <Section>
-      <Title>Wireguard VPN</Title>
+      <Title>WireGuard VPN</Title>
     </Section>
     <Section align="end" toolbar>
       <small class="user">Logged in as {user}</small>
diff --git a/ui/src/index.js b/ui/src/index.js
index 3a78805..a8d8a74 100644
--- a/ui/src/index.js
+++ b/ui/src/index.js
@@ -4,7 +4,7 @@ import App from "./App.svelte";
 const app = new App({
     target: document.body,
     props: {
-        name: "Wireguard VPN"
+        name: "WireGuard VPN"
     }
 });