Updated names to avoid conflicts

Apparently, two snippets can't have the same name and different
keys. Now they all show up in yasnippet properly.

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>