diff --git a/gtksourceview/language-specs/gvim.xml b/gtksourceview/language-specs/gvim.xml
index 99f2048..582ce8f 100644
--- a/gtksourceview/language-specs/gvim.xml
+++ b/gtksourceview/language-specs/gvim.xml
@@ -50,6 +50,7 @@
 
   <!-- Identifiers -->
   <style name="def:identifier"              foreground="cyan"/>
+  <style name="def:builtin"                 foreground="#2E8B57" bold="true"/>
 
   <!-- Statements -->
   <style name="def:statement"               foreground="bordeaux" bold="true"/>
@@ -85,8 +86,6 @@
   <style name="sh:variable1"                foreground="#6A5ACD"/>
   <style name="sh:variable2"                foreground="#008B8B"/>
 
-  <style name="python:builtins"             foreground="#2E8B57" bold="true"/>
-
   <!-- legacy styles for old lang files -->
   <style name="Others"                      foreground="#2E8B57" bold="true"/>
   <style name="Others 2"                    foreground="#008B8B"/>
diff --git a/gtksourceview/language-specs/python.lang b/gtksourceview/language-specs/python.lang
index eb5965d..e74cc10 100644
--- a/gtksourceview/language-specs/python.lang
+++ b/gtksourceview/language-specs/python.lang
@@ -31,8 +31,8 @@
   <styles>
     <style id="module-handler"    _name="Module Handler"    map-to="def:preprocessor"/>
     <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="function"          _name="Function"          map-to="def:keyword"/>
-    <style id="builtins"          _name="Builtins"          map-to="def:type"/>
+    <style id="function"          _name="Function Keyword"  map-to="def:keyword"/>
+    <style id="builtin"           _name="Builtin Function"  map-to="def:builtin"/>
     <style id="multiline-string"  _name="Multiline string"  map-to="def:string"/>
     <style id="string"            _name="String"            map-to="def:string"/>
     <style id="escaped-char"      _name="Escaped Character" map-to="def:special-char"/>