diff --git a/src/relaxng/settings.rnc b/src/relaxng/settings.rnc
index 0e4942e357..58699a2a26 100644
--- a/src/relaxng/settings.rnc
+++ b/src/relaxng/settings.rnc
@@ -101,11 +101,11 @@ element settings {
         attribute batches { list { xsd:positiveInteger+ } }) |
       (element interval { xsd:positiveInteger } | 
         attribute interval { xsd:positiveInteger })
-    ) &
-    (element source_separate { xsd:boolean } | 
-      attribute source_separate { xsd:boolean })? &
-    (element source_write { xsd:boolean } | 
-      attribute source_write { xsd:boolean })? &
+    )? &
+    (element separate { xsd:boolean } | 
+      attribute separate { xsd:boolean })? &
+    (element write { xsd:boolean } | 
+      attribute write { xsd:boolean })? &
     (element overwrite_latest { xsd:boolean} |
       attribute overwrite_latest {xsd:boolean})?
   }? &