# Pastebin qHO4nsvj
zyga@fyke2:~/Documents/go/src/github.com/snapcore/snapd/cmd/snap$ git diff 
diff --git a/snap/info.go b/snap/info.go
index c0e93b9e7..b6a044862 100644
--- a/snap/info.go
+++ b/snap/info.go
@@ -995,7 +995,7 @@ func JoinSnapApp(snap, app string) string {
 // UseNick returns the nickname for given snap name. If there is none, returns
 // the original name.
 func UseNick(snapName string) string {
-       if snapName == "core" {
+       if snapName == "core" || snapName == "snapd" {
                return "system"
        }
        return snapName
@@ -1005,7 +1005,7 @@ func UseNick(snapName string) string {
 // the original name.
 func DropNick(nick string) string {
        if nick == "system" {
-               return "core"
+               return "core" // or "snapd", we don't know because the nick concept is broken.
        }
        return nick
 }