diff --git a/data/multiplayer/scenarios/test_lua_mapgen.lua b/data/multiplayer/scenarios/test_lua_mapgen.lua
index a5f2f59429c0..62c36776d781 100644
--- a/data/multiplayer/scenarios/test_lua_mapgen.lua
+++ b/data/multiplayer/scenarios/test_lua_mapgen.lua
@@ -11,23 +11,15 @@ local function f_terrain(terrain)
 end
 
 local function f_and(...)
-	return { "and",  ... }
-end
-
-local function f_nand(...)
-	return { "nand",  ... }
+	return { "all",  ... }
 end
 
 local function f_not(...)
-	return { "nand",  ... }
+	return { "none",  ... }
 end
 
 local function f_or(...)
-	return { "or",  ... }
-end
-
-local function f_nor(...)
-	return { "nor",  ... }
+	return { "any",  ... }
 end
 
 local function f_adjacent(f, ad, count)
diff --git a/src/scripting/lua_terrainfilter.cpp b/src/scripting/lua_terrainfilter.cpp
index 0a0cfaf836a7..36df116f1d7f 100644
--- a/src/scripting/lua_terrainfilter.cpp
+++ b/src/scripting/lua_terrainfilter.cpp
@@ -638,10 +638,10 @@ enum filter_keys { F_AND, F_OR, F_NAND, F_NOR, F_X, F_Y, F_FIND_IN, F_ADJACENT,
 //todoc++14: std::unordered_map doesn'tsupport herterogrnous lookup.
 //todo consider renaming and -> all ,or ->any, nor -> none, nand -> notall
 static const std::unordered_map<std::string, filter_keys> keys {
-	{ "and", F_AND }, 
-	{ "or", F_OR }, 
-	{ "nand", F_NAND }, 
-	{ "or", F_NOR }, 
+	{ "all", F_AND }, 
+	{ "any", F_OR }, 
+	{ "not_all", F_NAND }, 
+	{ "none", F_NOR }, 
 	{ "x", F_X },
 	{ "y", F_Y },
 	{ "find_in", F_FIND_IN },