diff --git a/assets/css/components/discussions/manager.css b/assets/css/components/discussions/manager.css
index 4b397075..c00a34a9 100644
--- a/assets/css/components/discussions/manager.css
+++ b/assets/css/components/discussions/manager.css
@@ -13,7 +13,7 @@
 	right: 0px;
 }
 
-#discussionsElem .open-conversation-button {
+#discussionsElem .open-discussion-button {
 	border-top-left-radius: 2px;
 	border-top-right-radius: 2px;
 	border-bottom-left-radius: 0px;
diff --git a/assets/css/components/discussions/windows.css b/assets/css/components/discussions/windows.css
index b7afb9e6..a69b0935 100644
--- a/assets/css/components/discussions/windows.css
+++ b/assets/css/components/discussions/windows.css
@@ -1,5 +1,5 @@
 /**
- * Conversation window
+ * Discussions windows
  * 
  * @author Pierre HUBERT
  */
diff --git a/assets/js/components/discussions/manager.js b/assets/js/components/discussions/manager.js
index e0188d31..5b32a25e 100644
--- a/assets/js/components/discussions/manager.js
+++ b/assets/js/components/discussions/manager.js
@@ -55,23 +55,23 @@ ComunicWeb.components.discussions.manager = {
 	 */
 	init: function(discussionsContainerElem){
 		
-		//First, add the "open a conversation" new
-		this.addOpenConversationButton(discussionsContainerElem);
+		//First, add the "open a discussion" new
+		this.addOpenDiscussionButton(discussionsContainerElem);
 
 	},
 
 	/**
-	 * Add the "open conversation" button
+	 * Add the "open discussion" button
 	 * 
 	 * @param {HTMLElement} targetElem The target of the button
 	 * @return {Boolean} True for a success
 	 */
-	addOpenConversationButton: function(targetElem){
+	addOpenDiscussionButton: function(targetElem){
 
 		//Create the button
 		var addButton = createElem("button", targetElem);
-		addButton.className = "btn btn-primary open-conversation-button";
-		addButton.innerHTML = "Open a conversation";
+		addButton.className = "btn btn-primary open-discussion-button";
+		addButton.innerHTML = "Open a discussion";
 		
 		
 		//Temporary behavior