diff --git a/autoload/airline.vim b/autoload/airline.vim
index 33d19bcb..63fc270b 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -26,7 +26,7 @@ function! airline#add_inactive_statusline_func(name)
 endfunction
 
 function! airline#load_theme()
-  highlight! default link airline_warningmsg WarningMsg
+  highlight! default link airline_warning WarningMsg
   call airline#highlighter#load_theme()
   call airline#extensions#load_theme()
 endfunction
diff --git a/autoload/airline/extensions/default.vim b/autoload/airline/extensions/default.vim
index 764d65dd..3af84ddb 100644
--- a/autoload/airline/extensions/default.vim
+++ b/autoload/airline/extensions/default.vim
@@ -39,7 +39,7 @@ function! airline#extensions#default#apply(builder, context)
     call a:builder.add_section('airline_z', s:get_section(winnr, 'z'))
     if active
       call a:builder.add_raw('%(')
-      call a:builder.add_section('airline_warningmsg', s:get_section(winnr, 'warning', '', ''))
+      call a:builder.add_section('airline_warning', s:get_section(winnr, 'warning', '', ''))
       call a:builder.add_raw('%)')
     endif
   endif
diff --git a/autoload/airline/themes/solarized.vim b/autoload/airline/themes/solarized.vim
index 521e46f8..921ebac9 100644
--- a/autoload/airline/themes/solarized.vim
+++ b/autoload/airline/themes/solarized.vim
@@ -112,7 +112,7 @@ function! s:generate()
         \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]],
         \ s:NFa)
 
-  let g:airline#themes#solarized#palette.normal.airline_warningmsg = [
+  let g:airline#themes#solarized#palette.normal.airline_warning = [
         \ s:NW[0].g, s:NW[1].g, s:NW[0].t, s:NW[1].t, s:NW[2]]
 
   let g:airline#themes#solarized#palette.normal_modified = {