diff --git a/src/tap/config/TAPConfiguration.java b/src/tap/config/TAPConfiguration.java
index 330ec82c7c82839c089964f6397195aae67de8b8..bdf2b0a933d3c2448f7d340375977bfbf0b0785e 100644
--- a/src/tap/config/TAPConfiguration.java
+++ b/src/tap/config/TAPConfiguration.java
@@ -89,7 +89,7 @@ public final class TAPConfiguration {
 	public final static int DEFAULT_UPLOAD_MAX_FILE_SIZE = Integer.MAX_VALUE;
 
 	/* OUTPUT KEYS */
-	public final static String KEY_OUTPUT_FORMATS = "output_add_formats";
+	public final static String KEY_OUTPUT_FORMATS = "output_formats";
 	public final static String VALUE_ALL = "ALL";
 	public final static String VALUE_VOTABLE = "votable";
 	public final static String VALUE_VOT = "vot";
diff --git a/src/tap/config/tap_configuration_file.html b/src/tap/config/tap_configuration_file.html
index 59a6ee8e589ab857ca00df00ba899e1d883205b0..93c07aac5ba1ad1280281a86b43fd393d57de78e 100644
--- a/src/tap/config/tap_configuration_file.html
+++ b/src/tap/config/tap_configuration_file.html
@@ -320,7 +320,7 @@
 					<p>The default period MUST be less or equals to the maximum retention period. If this rule is not respected, the default retention period is set immediately
 					 to the maximum retention period.</p>
 					<p>A negative or null value means there is no restriction on the default retention period: job results will be kept forever. Float values are not allowed.</p>
-					<p><em>By default query results are kept forever: default_retention_period=0.</em></p></td>
+					<p><em>By default query results are kept forever: <code>default_retention_period=0</code>.</em></p></td>
 				<td>86400 <em>(1 day)</em></td>
 			</tr>
 			<tr class="optional">
@@ -448,7 +448,7 @@
 			
 			<tr><td colspan="5">Output</td></tr>
 			<tr class="optional">
-				<td class="done">output_add_formats</td>
+				<td class="done">output_formats</td>
 				<td></td>
 				<td>text</td>
 				<td>
diff --git a/src/tap/config/tap_full.properties b/src/tap/config/tap_full.properties
index 52bfd3b1056b1a7c371fdf1e2abc7ca58a298978..38cc237a0e8ebe777fc73b94c76f7a0e4db2a938 100644
--- a/src/tap/config/tap_full.properties
+++ b/src/tap/config/tap_full.properties
@@ -2,7 +2,7 @@
 #             FULL TAP CONFIGURATION FILE                #
 #                                                        #
 # TAP Version: 2.0                                       #
-# Date: 04 Mars 2015                                     #
+# Date: 10 Mars 2015                                     #
 # Author: Gregory Mantelet (ARI)                         #
 #                                                        #
 ########################################################## 
@@ -43,7 +43,7 @@ provider_name = ARI
 
 # [OPTIONAL]
 # Description of the TAP Service.
-tap_description = My TAP Service is so amazing! You should use it with your favorite TAP client.
+service_description = My TAP Service is so amazing! You should use it with your favorite TAP client.
 
 ############
 # DATABASE #
@@ -316,7 +316,7 @@ max_execution_duration = 0
 # tap.ServiceConnection.
 # 
 # Default: ALL
-output_add_formats = ALL
+output_formats = ALL
 
 # [OPTIONAL]
 # Default limit for the result output.