diff --git a/src/lua/zencode.lua b/src/lua/zencode.lua
index 3b54a6049..047b90bce 100644
--- a/src/lua/zencode.lua
+++ b/src/lua/zencode.lua
@@ -416,7 +416,7 @@ function Iam(name)
 	if name then
 		ZEN.assert(not WHO, 'Identity already defined in WHO')
 		ZEN.assert(type(name) == 'string', 'Own name not a string')
-		WHO = name
+		WHO = uscore(name)
 	else
 		ZEN.assert(WHO, 'No identity specified in WHO')
 	end
diff --git a/test/zencode/given.bats b/test/zencode/given.bats
index e49edb0f9..f92257f40 100644
--- a/test/zencode/given.bats
+++ b/test/zencode/given.bats
@@ -292,9 +292,9 @@ EOF
 cat <<EOF | save_asset name_named_in.data
 {
 	"UserData": {
-	        "Sender": "Alice"
+	        "Sender": "Alice in wonderland"
 	},
-	"Alice": {
+	"Alice in wonderland": {
 		"keyring": {
 			"ecdh": "2mZDRS1rE4jT5EuozwZfbS+GLE7ogBfgWOr30wXoe3g="
 		}
@@ -311,7 +311,7 @@ Given that I have my 'keyring'
 Then print my 'keyring'
 EOF
     save_output 'name_named_in.json'
-    assert_output '{"Alice":{"keyring":{"ecdh":"2mZDRS1rE4jT5EuozwZfbS+GLE7ogBfgWOr30wXoe3g="}}}'
+    assert_output '{"Alice_in_wonderland":{"keyring":{"ecdh":"2mZDRS1rE4jT5EuozwZfbS+GLE7ogBfgWOr30wXoe3g="}}}'
 }