diff --git a/Propellor/Attr.hs b/Propellor/Attr.hs
index a54d883..fb94dc3 100644
--- a/Propellor/Attr.hs
+++ b/Propellor/Attr.hs
@@ -42,8 +42,8 @@ ipv6 addr = pureAttrProperty ("ipv6 " ++ addr)
 	(addDNS $ Address $ IPv6 addr)
 
 -- | Indicates another name for the host in the DNS.
-aka :: Domain -> Property
-aka domain = pureAttrProperty ("aka " ++ domain)
+alias :: Domain -> Property
+alias domain = pureAttrProperty ("aka " ++ domain)
 	(addDNS $ CNAME $ AbsDomain domain)
 
 addDNS :: Record -> SetAttr
diff --git a/Propellor/Property/Dns.hs b/Propellor/Property/Dns.hs
index 90556d2..e47d6c3 100644
--- a/Propellor/Property/Dns.hs
+++ b/Propellor/Property/Dns.hs
@@ -30,7 +30,7 @@ import Data.List
 --
 -- > host "foo.example.com"
 -- >   & ipv4 "192.168.1.1"
--- >   & aka "mail.exmaple.com"
+-- >   & alias "mail.exmaple.com"
 --
 -- Will cause that hostmame and its alias to appear in the zone file,
 -- with the configured IP address.
@@ -134,7 +134,7 @@ namedConfFile = "/etc/bind/named.conf.local"
 -- repository to the SerialNumber.
 --
 -- Handy trick: You don't need to list IPAddrs in the [Record],
--- just make some Host sets its `aka` to the root of domain.
+-- just make some Host sets its `alias` to the root of domain.
 mkSOA :: Domain -> SerialNumber -> [Record] -> SOA
 mkSOA d sn rs = SOA
 	{ sDomain = AbsDomain d
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index e05a8dd..e5b8d64 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -183,8 +183,8 @@ memory = runProp "memory"
 
 -- | Link with another container on the same host.
 link :: ContainerName -> ContainerAlias -> Property
-link linkwith alias = genProp "link" $ \hn ->
-	fromContainerId (ContainerId hn linkwith) ++ ":" ++ alias
+link linkwith calias = genProp "link" $ \hn ->
+	fromContainerId (ContainerId hn linkwith) ++ ":" ++ calias
 
 -- | A short alias for a linked container.
 -- Each container has its own alias namespace.
diff --git a/config-joey.hs b/config-joey.hs
index e49a062..b22f0e0 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -48,18 +48,18 @@ hosts =               --                  (o)  `
 		& Postfix.satellite
 		& Docker.configured
 
-		& aka "shell.olduse.net"
+		& alias "shell.olduse.net"
 		& JoeySites.oldUseNetShellBox
 
-		& aka "openid.kitenet.net"
+		& alias "openid.kitenet.net"
 		& Docker.docked hosts "openid-provider"
 		 	`requires` Apt.installed ["ntp"]
 
-		& aka "ancient.kitenet.net"
+		& alias "ancient.kitenet.net"
 		& Docker.docked hosts "ancient-kitenet"
 
 		-- I'd rather this were on diatom, but it needs unstable.
-		& aka "kgb.kitenet.net"
+		& alias "kgb.kitenet.net"
 		& JoeySites.kgbServer
 
 		& Docker.garbageCollected `period` Daily
@@ -101,25 +101,25 @@ hosts =               --                  (o)  `
 		& Apache.multiSSL
 		& File.ownerGroup "/srv/web" "joey" "joey"
 
-		& aka "git.kitenet.net"
-		& aka "git.joeyh.name"
+		& alias "git.kitenet.net"
+		& alias "git.joeyh.name"
 		& JoeySites.gitServer hosts
 	
-		& aka "downloads.kitenet.net"
+		& alias "downloads.kitenet.net"
 		& JoeySites.annexWebSite hosts "/srv/git/downloads.git"
 			"downloads.kitenet.net"
 			"840760dc-08f0-11e2-8c61-576b7e66acfd"
 			[("turtle", "ssh://turtle.kitenet.net/~/lib/downloads/")]
 		& JoeySites.annexRsyncServer
 
-		& aka "tmp.kitenet.net"
+		& alias "tmp.kitenet.net"
 		& JoeySites.annexWebSite hosts "/srv/git/joey/tmp.git"
 			"tmp.kitenet.net"
 			"26fd6e38-1226-11e2-a75f-ff007033bdba"
 			[]
 		& JoeySites.twitRss
 		
-		& aka "nntp.olduse.net"
+		& alias "nntp.olduse.net"
 		& JoeySites.oldUseNetServer hosts
 		
 		& Dns.primary hosts "olduse.net"
@@ -285,11 +285,11 @@ monsters =	      -- but do want to track their public keys etc.
 	, host "wren.kitenet.net"
 		& ipv4 "80.68.85.49"
 		& ipv6 "2001:41c8:125:49::10"
-		& aka "kite.kitenet.net"
+		& alias "kite.kitenet.net"
 	, host "branchable.com"
 		& ipv4 "66.228.46.55"
 		& ipv6 "2600:3c03::f03c:91ff:fedf:c0e5"
-		& aka "olduse.net"
-		& aka "www.olduse.net"
-		& aka "git.olduse.net"
+		& alias "olduse.net"
+		& alias "www.olduse.net"
+		& alias "git.olduse.net"
 	]
diff --git a/debian/changelog b/debian/changelog
index 463b181..136d61b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,8 @@ propellor (0.4.0) UNRELEASED; urgency=medium
   * Propellor can configure primary DNS servers, including generating
     zone files, which is done by looking at the properties of hosts
     in a domain.
-  * The `cname` property was renamed to `aka` as it does not always generate
-    CNAME in the DNS.
+  * The `cname` property was renamed to `alias` as it does not always
+    generate CNAME in the DNS.
   * Constructor of Property has changed (use `property` function instead).
   * All Property combinators now combine together their Attr settings.
     So Attr settings can be made inside a propertyList, for example.