diff --git a/enigme.java/Condition.java b/enigme.java/Condition.java
index 6c51ff8..318d995 100644
--- a/enigme.java/Condition.java
+++ b/enigme.java/Condition.java
@@ -1,9 +1,11 @@
 public class Condition {
 
     String condition;
-    ConditionEt[] conditionEts;
+    List<ConditionEt> conditionEts;
 
-    public Condition(String condition, ConditionEt[] conditionEts) {
+    public Condition(
+            String condition,
+            List<ConditionEt> conditionEts) {
         this.condition = condition;
         this.conditionEts = conditionEts;
     }
diff --git a/enigme.java/ConditionConnaissance.java b/enigme.java/ConditionConnaissance.java
index 25f7874..beb7a11 100644
--- a/enigme.java/ConditionConnaissance.java
+++ b/enigme.java/ConditionConnaissance.java
@@ -3,7 +3,9 @@ public class ConditionConnaissance implements ConditionTest {
     Connaissance connaissance;
     Boolean negation;
 
-    public ConditionConnaissance(String connaissance, Boolean negation) {
+    public ConditionConnaissance(
+            Connaissance connaissance,
+            Boolean negation) {
         this.connaissance = connaissance;
         this.negation = negation;
     }
diff --git a/enigme.java/ConditionEt.java b/enigme.java/ConditionEt.java
index c75aa77..993d03b 100644
--- a/enigme.java/ConditionEt.java
+++ b/enigme.java/ConditionEt.java
@@ -1,6 +1,6 @@
 public class ConditionEt {
 
-    ConditionTest[] conditionTests;
+    List<ConditionTest> conditionTests;
 
     public ConditionEt(ConditionTest[] conditionTests) {
         this.conditionTests = conditionTests;
diff --git a/test.game b/test.game
index df0d70a..6b03ea0 100644
--- a/test.game
+++ b/test.game
@@ -63,7 +63,7 @@
         "lieu_in": "Énigme",
         "lieu_out": "Succès",
         "ouvert": "(true)",
-        "visible": "(connaissance_Réussite==1)",
+        "visible": "(Réussite==1)",
         "obligatoire": "(false)",
         "connaissances_gift": [],
         "objets_gift": [],
@@ -79,7 +79,7 @@
         "lieu_in": "Énigme",
         "lieu_out": "Échec",
         "ouvert": "(true)",
-        "visible": "(objet_tentatives==0)",
+        "visible": "(tentatives==0)",
         "obligatoire": "(false)",
         "connaissances": [],
         "objets": [],
diff --git a/workspace/game/bin/xtext/Game.xtext b/workspace/game/bin/xtext/Game.xtext
index e5969a9..f298e80 100644
--- a/workspace/game/bin/xtext/Game.xtext
+++ b/workspace/game/bin/xtext/Game.xtext
@@ -130,15 +130,15 @@ ConditionTest:
 ;
 
 ConditionConnaissance:
-  'connaissance_' connaissance=Nom
+  connaissance=Nom
 ;
 
 NOTConditionConnaissance:
-  '!' 'connaissance_' connaissance=Nom
+  '!' connaissance=Nom
 ;
 
 ConditionObjet:
-  'objet_' objet=Nom comparateur=Comparateur nombre=INT
+  objet=Nom comparateur=Comparateur nombre=INT
 ;
 
 Comparateur:
diff --git a/workspace/game/src/xtext/Game.xtext b/workspace/game/src/xtext/Game.xtext
index e5969a9..f298e80 100644
--- a/workspace/game/src/xtext/Game.xtext
+++ b/workspace/game/src/xtext/Game.xtext
@@ -130,15 +130,15 @@ ConditionTest:
 ;
 
 ConditionConnaissance:
-  'connaissance_' connaissance=Nom
+  connaissance=Nom
 ;
 
 NOTConditionConnaissance:
-  '!' 'connaissance_' connaissance=Nom
+  '!' connaissance=Nom
 ;
 
 ConditionObjet:
-  'objet_' objet=Nom comparateur=Comparateur nombre=INT
+  objet=Nom comparateur=Comparateur nombre=INT
 ;
 
 Comparateur: