diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index adea1ac33..349589e7e 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -152,11 +152,11 @@ struct t_config_option *config_color_bar_more;
 struct t_config_option *config_color_chat;
 struct t_config_option *config_color_chat_bg;
 struct t_config_option *config_color_chat_inactive_window;
-struct t_config_option *config_color_chat_inactive_line;
+struct t_config_option *config_color_chat_inactive_buffer;
 struct t_config_option *config_color_chat_time;
 struct t_config_option *config_color_chat_time_delimiters;
 struct t_config_option *config_color_chat_prefix_buffer;
-struct t_config_option *config_color_chat_prefix_buffer_inactive_line;
+struct t_config_option *config_color_chat_prefix_buffer_inactive_buffer;
 struct t_config_option *config_color_chat_prefix[GUI_CHAT_NUM_PREFIXES];
 struct t_config_option *config_color_chat_prefix_more;
 struct t_config_option *config_color_chat_prefix_suffix;
@@ -2090,12 +2090,12 @@ config_weechat_init_options ()
            "window)"),
         NULL, GUI_COLOR_CHAT_INACTIVE_WINDOW, 0, "darkgray", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_inactive_line = config_file_new_option (
+    config_color_chat_inactive_buffer = config_file_new_option (
         weechat_config_file, ptr_section,
-        "chat_inactive_line", "color",
+        "chat_inactive_buffer", "color",
         N_("text color for chat when line is inactive (buffer is merged with "
            "other buffers and is not selected)"),
-        NULL, GUI_COLOR_CHAT_INACTIVE_LINE, 0, "darkgray", NULL, 0,
+        NULL, GUI_COLOR_CHAT_INACTIVE_BUFFER, 0, "darkgray", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
     config_color_chat_time = config_file_new_option (
         weechat_config_file, ptr_section,
@@ -2116,13 +2116,13 @@ config_weechat_init_options ()
            "merged with same number)"),
         NULL, GUI_COLOR_CHAT_PREFIX_BUFFER, 0, "brown", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_prefix_buffer_inactive_line = config_file_new_option (
+    config_color_chat_prefix_buffer_inactive_buffer = config_file_new_option (
         weechat_config_file, ptr_section,
-        "chat_prefix_buffer_inactive_line", "color",
+        "chat_prefix_buffer_inactive_buffer", "color",
         N_("text color for inactive buffer name (before prefix, when many "
            "buffers are merged with same number and if buffer is not "
             "selected)"),
-        NULL, GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_LINE, 0, "darkgray", NULL, 0,
+        NULL, GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_BUFFER, 0, "darkgray", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
     config_color_chat_prefix[GUI_CHAT_PREFIX_ERROR] = config_file_new_option (
         weechat_config_file, ptr_section,
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 3e863f840..323d6fe66 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -174,11 +174,11 @@ extern struct t_config_option *config_color_bar_more;
 extern struct t_config_option *config_color_chat;
 extern struct t_config_option *config_color_chat_bg;
 extern struct t_config_option *config_color_chat_inactive_window;
-extern struct t_config_option *config_color_chat_inactive_line;
+extern struct t_config_option *config_color_chat_inactive_buffer;
 extern struct t_config_option *config_color_chat_time;
 extern struct t_config_option *config_color_chat_time_delimiters;
 extern struct t_config_option *config_color_chat_prefix_buffer;
-extern struct t_config_option *config_color_chat_prefix_buffer_inactive_line;
+extern struct t_config_option *config_color_chat_prefix_buffer_inactive_buffer;
 extern struct t_config_option *config_color_chat_prefix[];
 extern struct t_config_option *config_color_chat_prefix_more;
 extern struct t_config_option *config_color_chat_prefix_suffix;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 811a7814d..f1633449e 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -120,7 +120,7 @@ gui_chat_reset_style (struct t_gui_window *window, struct t_gui_line *line)
             if (line && !(line->data->buffer->active))
             {
                 gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat,
-                                        GUI_COLOR_CHAT_INACTIVE_LINE);
+                                        GUI_COLOR_CHAT_INACTIVE_BUFFER);
             }
             else
             {
@@ -591,7 +591,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                           ((!CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer))
                                            || ((gui_current_window == window) && (line->data->buffer->active))) ?
                                           GUI_COLOR_CHAT_PREFIX_BUFFER :
-                                          GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_LINE);
+                                          GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_BUFFER);
         }
         
         if (window->win_chat_cursor_y < window->coords_size)
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index 237501983..027910fc7 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -1383,8 +1383,8 @@ gui_color_init_weechat ()
     gui_color_build (GUI_COLOR_CHAT_PREFIX_BUFFER, CONFIG_COLOR(config_color_chat_prefix_buffer), CONFIG_COLOR(config_color_chat_bg));
     gui_color_build (GUI_COLOR_CHAT_TAGS, CONFIG_COLOR(config_color_chat_tags), CONFIG_COLOR(config_color_chat_bg));
     gui_color_build (GUI_COLOR_CHAT_INACTIVE_WINDOW, CONFIG_COLOR(config_color_chat_inactive_window), CONFIG_COLOR(config_color_chat_bg));
-    gui_color_build (GUI_COLOR_CHAT_INACTIVE_LINE, CONFIG_COLOR(config_color_chat_inactive_line), CONFIG_COLOR(config_color_chat_bg));
-    gui_color_build (GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_LINE, CONFIG_COLOR(config_color_chat_prefix_buffer_inactive_line), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_INACTIVE_BUFFER, CONFIG_COLOR(config_color_chat_inactive_buffer), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_BUFFER, CONFIG_COLOR(config_color_chat_prefix_buffer_inactive_buffer), CONFIG_COLOR(config_color_chat_bg));
     
     /*
      * define old nick colors for compatibility on /upgrade with previous
diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h
index 90c2574a9..b78cfe4b0 100644
--- a/src/gui/gui-color.h
+++ b/src/gui/gui-color.h
@@ -63,8 +63,8 @@ enum t_gui_color_enum
     GUI_COLOR_CHAT_PREFIX_BUFFER,
     GUI_COLOR_CHAT_TAGS,
     GUI_COLOR_CHAT_INACTIVE_WINDOW,
-    GUI_COLOR_CHAT_INACTIVE_LINE,
-    GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_LINE,
+    GUI_COLOR_CHAT_INACTIVE_BUFFER,
+    GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_BUFFER,
     
     /* number of colors */
     GUI_COLOR_NUM_COLORS,