diff --git a/Source/Libs/Shared/GLibrary.cs b/Source/Libs/Shared/GLibrary.cs
index 38020ce26..68e36ea2c 100644
--- a/Source/Libs/Shared/GLibrary.cs
+++ b/Source/Libs/Shared/GLibrary.cs
@@ -27,7 +27,7 @@ class GLibrary
         _libraryDefinitions[Library.GdkPixbuf] = new[] { "libgdk_pixbuf-2.0-0.dll", "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.dylib", "gdk_pixbuf-2.dll" };
         _libraryDefinitions[Library.Gtk] = new[] { "libgtk-3-0.dll", "libgtk-3.so.0", "libgtk-3.0.dylib", "gtk-3.dll" };
         _libraryDefinitions[Library.PangoCairo] = new[] { "libpangocairo-1.0-0.dll", "libpangocairo-1.0.so.0", "libpangocairo-1.0.0.dylib", "pangocairo-1.dll" };
-        _libraryDefinitions[Library.Source] = new[] { "libgtksourceview-4-0.dll", "libgtksourceview-4.so.0", "libgtksourceview-4.0.dylib", "gtksourceview-4.dll" };
+        _libraryDefinitions[Library.GtkSource] = new[] { "libgtksourceview-4-0.dll", "libgtksourceview-4.so.0", "libgtksourceview-4.0.dylib", "gtksourceview-4.dll" };
     }
 
     public static IntPtr Load(Library library)
diff --git a/Source/Libs/Shared/Library.cs b/Source/Libs/Shared/Library.cs
index 0e2ad9410..b47e74888 100644
--- a/Source/Libs/Shared/Library.cs
+++ b/Source/Libs/Shared/Library.cs
@@ -11,5 +11,5 @@ enum Library
     Gdk,
     GdkPixbuf,
     Gtk,
-    Source
+    GtkSource
 }
\ No newline at end of file
diff --git a/Source/Libs/SourceView/Buffer.cs b/Source/Libs/SourceView/Buffer.cs
new file mode 100644
index 000000000..daf62c0b5
--- /dev/null
+++ b/Source/Libs/SourceView/Buffer.cs
@@ -0,0 +1,12 @@
+namespace GtkSource
+{
+    using System;
+    public partial class Buffer : Gtk.TextBuffer
+    {
+        public Buffer() : base(IntPtr.Zero)
+        {
+            owned = true;
+            Raw = gtk_source_buffer_new(IntPtr.Zero);
+        }
+    }
+}
diff --git a/Source/Libs/SourceView/GtkSourceBuffer.cs b/Source/Libs/SourceView/GtkSourceBuffer.cs
deleted file mode 100644
index 30bca91ba..000000000
--- a/Source/Libs/SourceView/GtkSourceBuffer.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Gtk.Source
-{
-    using System;
-    public partial class GtkSourceBuffer : Gtk.TextBuffer
-    {
-        public GtkSourceBuffer() : base(IntPtr.Zero)
-        {
-            owned = true;
-            Raw = gtk_source_buffer_new(IntPtr.Zero);
-        }
-    }
-}
diff --git a/Source/Libs/SourceView/SourceView-api.xml b/Source/Libs/SourceView/SourceView-api.xml
index 45b5682ab..47ff74d96 100644
--- a/Source/Libs/SourceView/SourceView-api.xml
+++ b/Source/Libs/SourceView/SourceView-api.xml
@@ -6,37 +6,37 @@
         Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
 
 -->
-  <namespace name="Gtk.Source" library="libgtksourceview-4.so">
-    <enum name="GtkSourceBackgroundPatternType" cname="GtkSourceBackgroundPatternType" type="enum">
+  <namespace name="GtkSource" library="libgtksourceview-4.so">
+    <enum name="BackgroundPatternType" cname="GtkSourceBackgroundPatternType" type="enum">
       <member cname="GTK_SOURCE_BACKGROUND_PATTERN_TYPE_NONE" name="None" />
       <member cname="GTK_SOURCE_BACKGROUND_PATTERN_TYPE_GRID" name="Grid" />
     </enum>
-    <enum name="GtkSourceBracketMatchType" cname="GtkSourceBracketMatchType" type="enum">
+    <enum name="BracketMatchType" cname="GtkSourceBracketMatchType" type="enum">
       <member cname="GTK_SOURCE_BRACKET_MATCH_NONE" name="None" />
       <member cname="GTK_SOURCE_BRACKET_MATCH_OUT_OF_RANGE" name="OutOfRange" />
       <member cname="GTK_SOURCE_BRACKET_MATCH_NOT_FOUND" name="NotFound" />
       <member cname="GTK_SOURCE_BRACKET_MATCH_FOUND" name="Found" />
     </enum>
-    <enum name="GtkSourceChangeCaseType" cname="GtkSourceChangeCaseType" type="enum">
+    <enum name="ChangeCaseType" cname="GtkSourceChangeCaseType" type="enum">
       <member cname="GTK_SOURCE_CHANGE_CASE_LOWER" name="Lower" />
       <member cname="GTK_SOURCE_CHANGE_CASE_UPPER" name="Upper" />
       <member cname="GTK_SOURCE_CHANGE_CASE_TOGGLE" name="Toggle" />
       <member cname="GTK_SOURCE_CHANGE_CASE_TITLE" name="Title" />
     </enum>
-    <enum name="GtkSourceCompletionActivation" cname="GtkSourceCompletionActivation" type="flags">
+    <enum name="CompletionActivation" cname="GtkSourceCompletionActivation" type="flags">
       <member cname="GTK_SOURCE_COMPLETION_ACTIVATION_NONE" name="None" />
       <member cname="GTK_SOURCE_COMPLETION_ACTIVATION_INTERACTIVE" name="Interactive" value="1 &lt;&lt; 0" />
       <member cname="GTK_SOURCE_COMPLETION_ACTIVATION_USER_REQUESTED" name="UserRequested" value="1 &lt;&lt; 1" />
     </enum>
-    <enum name="GtkSourceCompletionError" cname="GtkSourceCompletionError" type="enum">
+    <enum name="CompletionError" cname="GtkSourceCompletionError" type="enum">
       <member cname="GTK_SOURCE_COMPLETION_ERROR_ALREADY_BOUND" name="AlreadyBound" />
       <member cname="GTK_SOURCE_COMPLETION_ERROR_NOT_BOUND" name="NotBound" />
     </enum>
-    <enum name="GtkSourceCompressionType" cname="GtkSourceCompressionType" type="enum">
+    <enum name="CompressionType" cname="GtkSourceCompressionType" type="enum">
       <member cname="GTK_SOURCE_COMPRESSION_TYPE_NONE" name="None" />
       <member cname="GTK_SOURCE_COMPRESSION_TYPE_GZIP" name="Gzip" />
     </enum>
-    <enum name="GtkSourceContextFlags" cname="GtkSourceContextFlags" type="flags">
+    <enum name="ContextFlags" cname="GtkSourceContextFlags" type="flags">
       <member cname="GTK_SOURCE_CONTEXT_EXTEND_PARENT" name="ExtendParent" value="1 &lt;&lt; 0" />
       <member cname="GTK_SOURCE_CONTEXT_END_PARENT" name="EndParent" value="1 &lt;&lt; 1" />
       <member cname="GTK_SOURCE_CONTEXT_END_AT_LINE_END" name="EndAtLineEnd" value="1 &lt;&lt; 2" />
@@ -44,62 +44,62 @@
       <member cname="GTK_SOURCE_CONTEXT_ONCE_ONLY" name="OnceOnly" value="1 &lt;&lt; 4" />
       <member cname="GTK_SOURCE_CONTEXT_STYLE_INSIDE" name="StyleInside" value="1 &lt;&lt; 5" />
     </enum>
-    <enum name="GtkSourceContextRefOptions" cname="GtkSourceContextRefOptions" type="flags">
+    <enum name="ContextRefOptions" cname="GtkSourceContextRefOptions" type="flags">
       <member cname="GTK_SOURCE_CONTEXT_IGNORE_STYLE" name="IgnoreStyle" value="1 &lt;&lt; 0" />
       <member cname="GTK_SOURCE_CONTEXT_OVERRIDE_STYLE" name="OverrideStyle" value="1 &lt;&lt; 1" />
       <member cname="GTK_SOURCE_CONTEXT_REF_ORIGINAL" name="RefOriginal" value="1 &lt;&lt; 2" />
     </enum>
-    <enum name="GtkSourceFileLoaderError" cname="GtkSourceFileLoaderError" type="enum">
+    <enum name="FileLoaderError" cname="GtkSourceFileLoaderError" type="enum">
       <member cname="GTK_SOURCE_FILE_LOADER_ERROR_TOO_BIG" name="TooBig" />
       <member cname="GTK_SOURCE_FILE_LOADER_ERROR_ENCODING_AUTO_DETECTION_FAILED" name="EncodingAutoDetectionFailed" />
       <member cname="GTK_SOURCE_FILE_LOADER_ERROR_CONVERSION_FALLBACK" name="ConversionFallback" />
     </enum>
-    <enum name="GtkSourceFileSaverError" cname="GtkSourceFileSaverError" type="enum">
+    <enum name="FileSaverError" cname="GtkSourceFileSaverError" type="enum">
       <member cname="GTK_SOURCE_FILE_SAVER_ERROR_INVALID_CHARS" name="InvalidChars" />
       <member cname="GTK_SOURCE_FILE_SAVER_ERROR_EXTERNALLY_MODIFIED" name="ExternallyModified" />
     </enum>
-    <enum name="GtkSourceFileSaverFlags" cname="GtkSourceFileSaverFlags" type="flags">
+    <enum name="FileSaverFlags" cname="GtkSourceFileSaverFlags" type="flags">
       <member cname="GTK_SOURCE_FILE_SAVER_FLAGS_NONE" name="None" />
       <member cname="GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_INVALID_CHARS" name="IgnoreInvalidChars" value="1 &lt;&lt; 0" />
       <member cname="GTK_SOURCE_FILE_SAVER_FLAGS_IGNORE_MODIFICATION_TIME" name="IgnoreModificationTime" value="1 &lt;&lt; 1" />
       <member cname="GTK_SOURCE_FILE_SAVER_FLAGS_CREATE_BACKUP" name="CreateBackup" value="1 &lt;&lt; 2" />
     </enum>
-    <enum name="GtkSourceGutterRendererAlignmentMode" cname="GtkSourceGutterRendererAlignmentMode" type="enum">
+    <enum name="GutterRendererAlignmentMode" cname="GtkSourceGutterRendererAlignmentMode" type="enum">
       <member cname="GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_CELL" name="Cell" />
       <member cname="GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_FIRST" name="First" />
       <member cname="GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_LAST" name="Last" />
     </enum>
-    <enum name="GtkSourceGutterRendererState" cname="GtkSourceGutterRendererState" type="flags">
+    <enum name="GutterRendererState" cname="GtkSourceGutterRendererState" type="flags">
       <member cname="GTK_SOURCE_GUTTER_RENDERER_STATE_NORMAL" name="Normal" />
       <member cname="GTK_SOURCE_GUTTER_RENDERER_STATE_CURSOR" name="Cursor" value="1 &lt;&lt; 0" />
       <member cname="GTK_SOURCE_GUTTER_RENDERER_STATE_PRELIT" name="Prelit" value="1 &lt;&lt; 1" />
       <member cname="GTK_SOURCE_GUTTER_RENDERER_STATE_SELECTED" name="Selected" value="1 &lt;&lt; 2" />
     </enum>
-    <enum name="GtkSourceNewlineType" cname="GtkSourceNewlineType" type="enum">
+    <enum name="NewlineType" cname="GtkSourceNewlineType" type="enum">
       <member cname="GTK_SOURCE_NEWLINE_TYPE_LF" name="Lf" />
       <member cname="GTK_SOURCE_NEWLINE_TYPE_CR" name="Cr" />
       <member cname="GTK_SOURCE_NEWLINE_TYPE_CR_LF" name="CrLf" />
     </enum>
-    <enum name="GtkSourceSmartHomeEndType" cname="GtkSourceSmartHomeEndType" type="enum">
+    <enum name="SmartHomeEndType" cname="GtkSourceSmartHomeEndType" type="enum">
       <member cname="GTK_SOURCE_SMART_HOME_END_DISABLED" name="Disabled" />
       <member cname="GTK_SOURCE_SMART_HOME_END_BEFORE" name="Before" />
       <member cname="GTK_SOURCE_SMART_HOME_END_AFTER" name="After" />
       <member cname="GTK_SOURCE_SMART_HOME_END_ALWAYS" name="Always" />
     </enum>
-    <enum name="GtkSourceSortFlags" cname="GtkSourceSortFlags" type="flags">
+    <enum name="SortFlags" cname="GtkSourceSortFlags" type="flags">
       <member cname="GTK_SOURCE_SORT_FLAGS_NONE" name="None" />
       <member cname="GTK_SOURCE_SORT_FLAGS_CASE_SENSITIVE" name="CaseSensitive" value="1 &lt;&lt; 0" />
       <member cname="GTK_SOURCE_SORT_FLAGS_REVERSE_ORDER" name="ReverseOrder" value="1 &lt;&lt; 1" />
       <member cname="GTK_SOURCE_SORT_FLAGS_REMOVE_DUPLICATES" name="RemoveDuplicates" value="1 &lt;&lt; 2" />
     </enum>
-    <enum name="GtkSourceSpaceLocationFlags" cname="GtkSourceSpaceLocationFlags" type="flags">
+    <enum name="SpaceLocationFlags" cname="GtkSourceSpaceLocationFlags" type="flags">
       <member cname="GTK_SOURCE_SPACE_LOCATION_NONE" name="None" />
       <member cname="GTK_SOURCE_SPACE_LOCATION_LEADING" name="Leading" value="1 &lt;&lt; 0" />
       <member cname="GTK_SOURCE_SPACE_LOCATION_INSIDE_TEXT" name="InsideText" value="1 &lt;&lt; 1" />
       <member cname="GTK_SOURCE_SPACE_LOCATION_TRAILING" name="Trailing" value="1 &lt;&lt; 2" />
       <member cname="GTK_SOURCE_SPACE_LOCATION_ALL" name="All" value="0x7" />
     </enum>
-    <enum name="GtkSourceSpaceTypeFlags" cname="GtkSourceSpaceTypeFlags" type="flags">
+    <enum name="SpaceTypeFlags" cname="GtkSourceSpaceTypeFlags" type="flags">
       <member cname="GTK_SOURCE_SPACE_TYPE_NONE" name="None" />
       <member cname="GTK_SOURCE_SPACE_TYPE_SPACE" name="Space" value="1 &lt;&lt; 0" />
       <member cname="GTK_SOURCE_SPACE_TYPE_TAB" name="Tab" value="1 &lt;&lt; 1" />
@@ -107,18 +107,18 @@
       <member cname="GTK_SOURCE_SPACE_TYPE_NBSP" name="Nbsp" value="1 &lt;&lt; 3" />
       <member cname="GTK_SOURCE_SPACE_TYPE_ALL" name="All" value="0xf" />
     </enum>
-    <enum name="GtkSourceViewGutterPosition" cname="GtkSourceViewGutterPosition" type="enum">
+    <enum name="ViewGutterPosition" cname="GtkSourceViewGutterPosition" type="enum">
       <member cname="GTK_SOURCE_VIEW_GUTTER_POSITION_LINES" name="Lines" value="-30" />
       <member cname="GTK_SOURCE_VIEW_GUTTER_POSITION_MARKS" name="Marks" value="-20" />
     </enum>
-    <callback name="GtkSourceMountOperationFactory" cname="GtkSourceMountOperationFactory">
+    <callback name="MountOperationFactory" cname="GtkSourceMountOperationFactory">
       <return-type type="GMountOperation*" />
       <parameters>
         <parameter type="GtkSourceFile*" name="file" />
         <parameter type="gpointer" name="userdata" />
       </parameters>
     </callback>
-    <interface name="GtkSourceCompletionProposal" cname="GtkSourceCompletionProposal">
+    <interface name="CompletionProposal" cname="GtkSourceCompletionProposal">
       <class_struct cname="GtkSourceCompletionProposalIface">
         <field name="Parent" cname="parent" type="GTypeInterface" />
         <method vm="get_label" />
@@ -211,7 +211,7 @@
         <return-type type="guint" />
       </method>
     </interface>
-    <interface name="GtkSourceCompletionProvider" cname="GtkSourceCompletionProvider">
+    <interface name="CompletionProvider" cname="GtkSourceCompletionProvider">
       <class_struct cname="GtkSourceCompletionProviderIface">
         <field name="GIface" cname="g_iface" type="GTypeInterface" />
         <method vm="get_name" />
@@ -361,7 +361,7 @@
         </parameters>
       </method>
     </interface>
-    <interface name="GtkSourceEngine" cname="GtkSourceEngine">
+    <interface name="Engine" cname="GtkSourceEngine">
       <class_struct cname="GtkSourceEngineInterface">
         <field name="ParentInterface" cname="parent_interface" type="GTypeInterface" />
         <method vm="attach_buffer" />
@@ -405,7 +405,7 @@
         </parameters>
       </virtual_method>
     </interface>
-    <interface name="GtkSourceStyleSchemeChooser" cname="GtkSourceStyleSchemeChooser">
+    <interface name="StyleSchemeChooser" cname="GtkSourceStyleSchemeChooser">
       <class_struct cname="GtkSourceStyleSchemeChooserInterface">
         <field name="BaseInterface" cname="base_interface" type="GTypeInterface" />
         <method vm="get_style_scheme" />
@@ -436,7 +436,7 @@
         </parameters>
       </method>
     </interface>
-    <interface name="GtkSourceUndoManager" cname="GtkSourceUndoManager">
+    <interface name="UndoManager" cname="GtkSourceUndoManager">
       <class_struct cname="GtkSourceUndoManagerIface">
         <field name="Parent" cname="parent" type="GTypeInterface" />
         <method vm="can_undo" />
@@ -508,7 +508,7 @@
         <return-type type="void" />
       </method>
     </interface>
-    <object name="GtkSourceBuffer" cname="GtkSourceBuffer" parent="GtkTextBuffer">
+    <object name="Buffer" cname="GtkSourceBuffer" parent="GtkTextBuffer">
       <class_struct cname="GtkSourceBufferClass">
         <field name="ParentClass" cname="parent_class" type="GtkTextBufferClass" />
         <method signal_vm="undo" />
@@ -759,7 +759,7 @@
         <return-type type="void" />
       </method>
     </object>
-    <object name="GtkSourceBufferInputStream" cname="GtkSourceBufferInputStream" parent="GInputStream">
+    <object name="BufferInputStream" cname="GtkSourceBufferInputStream" parent="GInputStream">
       <class_struct cname="GtkSourceBufferInputStreamClass">
         <field name="ParentClass" cname="parent_class" type="GInputStreamClass" />
       </class_struct>
@@ -768,7 +768,7 @@
       <property name="NewlineType" cname="newline-type" type="GtkSourceNewlineType" readable="true" writeable="true" construct-only="true" />
       <property name="AddTrailingNewline" cname="add-trailing-newline" type="gboolean" readable="true" writeable="true" construct-only="true" />
     </object>
-    <object name="GtkSourceBufferOutputStream" cname="GtkSourceBufferOutputStream" parent="GOutputStream">
+    <object name="BufferOutputStream" cname="GtkSourceBufferOutputStream" parent="GOutputStream">
       <class_struct cname="GtkSourceBufferOutputStreamClass">
         <field name="ParentClass" cname="parent_class" type="GOutputStreamClass" />
       </class_struct>
@@ -776,7 +776,7 @@
       <property name="Buffer" cname="buffer" type="GtkSourceBuffer" readable="true" writeable="true" construct-only="true" />
       <property name="RemoveTrailingNewline" cname="remove-trailing-newline" type="gboolean" readable="true" writeable="true" construct-only="true" />
     </object>
-    <object name="GtkSourceCompletion" cname="GtkSourceCompletion" parent="GObject">
+    <object name="Completion" cname="GtkSourceCompletion" parent="GObject">
       <class_struct cname="GtkSourceCompletionClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <method vm="proposal_activated" />
@@ -892,12 +892,12 @@
         <return-type type="void" />
       </method>
     </object>
-    <object name="GtkSourceCompletionContainer" cname="GtkSourceCompletionContainer" parent="GtkScrolledWindow">
+    <object name="CompletionContainer" cname="GtkSourceCompletionContainer" parent="GtkScrolledWindow">
       <class_struct cname="GtkSourceCompletionContainerClass">
         <field name="ParentClass" cname="parent_class" type="GtkScrolledWindowClass" />
       </class_struct>
     </object>
-    <object name="GtkSourceCompletionContext" cname="GtkSourceCompletionContext" parent="GInitiallyUnowned">
+    <object name="CompletionContext" cname="GtkSourceCompletionContext" parent="GInitiallyUnowned">
       <class_struct cname="GtkSourceCompletionContextClass">
         <field name="ParentClass" cname="parent_class" type="GInitiallyUnownedClass" />
         <method signal_vm="cancelled" />
@@ -932,7 +932,7 @@
         <return-type type="GType" />
       </method>
     </object>
-    <object name="GtkSourceCompletionInfo" cname="GtkSourceCompletionInfo" parent="GtkWindow">
+    <object name="CompletionInfo" cname="GtkSourceCompletionInfo" parent="GtkWindow">
       <class_struct cname="GtkSourceCompletionInfoClass">
         <field name="ParentClass" cname="parent_class" type="GtkWindowClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -950,7 +950,7 @@
       </method>
       <constructor cname="gtk_source_completion_info_new" />
     </object>
-    <object name="GtkSourceCompletionItem" cname="GtkSourceCompletionItem" parent="GObject">
+    <object name="CompletionItem" cname="GtkSourceCompletionItem" parent="GObject">
       <class_struct cname="GtkSourceCompletionItemClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1013,7 +1013,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceCompletionModel" cname="GtkSourceCompletionModel" parent="GObject">
+    <object name="CompletionModel" cname="GtkSourceCompletionModel" parent="GObject">
       <class_struct cname="GtkSourceCompletionModelClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <method vm="providers_changed" />
@@ -1107,7 +1107,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceContextEngine" cname="GtkSourceContextEngine" parent="GObject">
+    <object name="ContextEngine" cname="GtkSourceContextEngine" parent="GObject">
       <class_struct cname="GtkSourceContextEngineClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
       </class_struct>
@@ -1116,7 +1116,7 @@
         <interface cname="GtkSourceEngine" />
       </implements>
     </object>
-    <object name="GtkSourceFile" cname="GtkSourceFile" parent="GObject">
+    <object name="File" cname="GtkSourceFile" parent="GObject">
       <class_struct cname="GtkSourceFileClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1173,7 +1173,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceFileLoader" cname="GtkSourceFileLoader" parent="GObject">
+    <object name="FileLoader" cname="GtkSourceFileLoader" parent="GObject">
       <class_struct cname="GtkSourceFileLoaderClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1249,7 +1249,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceFileSaver" cname="GtkSourceFileSaver" parent="GObject">
+    <object name="FileSaver" cname="GtkSourceFileSaver" parent="GObject">
       <class_struct cname="GtkSourceFileSaverClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1346,7 +1346,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceGutter" cname="GtkSourceGutter" parent="GObject">
+    <object name="Gutter" cname="GtkSourceGutter" parent="GObject">
       <class_struct cname="GtkSourceGutterClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1394,7 +1394,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceGutterRenderer" cname="GtkSourceGutterRenderer" parent="GInitiallyUnowned">
+    <object name="GutterRenderer" cname="GtkSourceGutterRenderer" parent="GInitiallyUnowned">
       <class_struct cname="GtkSourceGutterRendererClass">
         <field name="ParentClass" cname="parent_class" type="GInitiallyUnownedClass" />
         <method vm="begin" />
@@ -1634,7 +1634,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceGutterRendererLines" cname="GtkSourceGutterRendererLines" parent="GtkSourceGutterRendererText">
+    <object name="GutterRendererLines" cname="GtkSourceGutterRendererLines" parent="GtkSourceGutterRendererText">
       <class_struct cname="GtkSourceGutterRendererLinesClass">
         <field name="ParentClass" cname="parent_class" type="GtkSourceGutterRendererTextClass" />
       </class_struct>
@@ -1644,7 +1644,7 @@
       </method>
       <constructor cname="gtk_source_gutter_renderer_lines_new" />
     </object>
-    <object name="GtkSourceGutterRendererMarks" cname="GtkSourceGutterRendererMarks" parent="GtkSourceGutterRendererPixbuf">
+    <object name="GutterRendererMarks" cname="GtkSourceGutterRendererMarks" parent="GtkSourceGutterRendererPixbuf">
       <class_struct cname="GtkSourceGutterRendererMarksClass">
         <field name="ParentClass" cname="parent_class" type="GtkSourceGutterRendererPixbufClass" />
       </class_struct>
@@ -1653,7 +1653,7 @@
       </method>
       <constructor cname="gtk_source_gutter_renderer_marks_new" />
     </object>
-    <object name="GtkSourceGutterRendererPixbuf" cname="GtkSourceGutterRendererPixbuf" parent="GtkSourceGutterRenderer">
+    <object name="GutterRendererPixbuf" cname="GtkSourceGutterRendererPixbuf" parent="GtkSourceGutterRenderer">
       <class_struct cname="GtkSourceGutterRendererPixbufClass">
         <field name="ParentClass" cname="parent_class" type="GtkSourceGutterRendererClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1694,7 +1694,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceGutterRendererText" cname="GtkSourceGutterRendererText" parent="GtkSourceGutterRenderer">
+    <object name="GutterRendererText" cname="GtkSourceGutterRendererText" parent="GtkSourceGutterRenderer">
       <class_struct cname="GtkSourceGutterRendererTextClass">
         <field name="ParentClass" cname="parent_class" type="GtkSourceGutterRendererClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1737,7 +1737,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceLanguage" cname="GtkSourceLanguage" parent="GObject">
+    <object name="Language" cname="GtkSourceLanguage" parent="GObject">
       <class_struct cname="GtkSourceLanguageClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1790,7 +1790,7 @@
         <return-type type="GType" />
       </method>
     </object>
-    <object name="GtkSourceLanguageManager" cname="GtkSourceLanguageManager" parent="GObject">
+    <object name="LanguageManager" cname="GtkSourceLanguageManager" parent="GObject">
       <class_struct cname="GtkSourceLanguageManagerClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1831,7 +1831,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceMap" cname="GtkSourceMap" parent="GtkSourceView">
+    <object name="Map" cname="GtkSourceMap" parent="GtkSourceView">
       <class_struct cname="GtkSourceMapClass">
         <field name="ParentClass" cname="parent_class" type="GtkSourceViewClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1852,7 +1852,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceMark" cname="GtkSourceMark" parent="GtkTextMark">
+    <object name="Mark" cname="GtkSourceMark" parent="GtkTextMark">
       <class_struct cname="GtkSourceMarkClass">
         <field name="ParentClass" cname="parent_class" type="GtkTextMarkClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1884,14 +1884,14 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceMarksSequence" cname="GtkSourceMarksSequence" parent="GObject">
+    <object name="MarksSequence" cname="GtkSourceMarksSequence" parent="GObject">
       <class_struct cname="GtkSourceMarksSequenceClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
       </class_struct>
       <field name="Priv" cname="priv" type="GtkSourceMarksSequencePrivate*" />
       <property name="Buffer" cname="buffer" type="GtkTextBuffer" readable="true" writeable="true" construct-only="true" />
     </object>
-    <object name="GtkSourceMarkAttributes" cname="GtkSourceMarkAttributes" parent="GObject">
+    <object name="MarkAttributes" cname="GtkSourceMarkAttributes" parent="GObject">
       <class_struct cname="GtkSourceMarkAttributesClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -1976,7 +1976,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourcePrintCompositor" cname="GtkSourcePrintCompositor" parent="GObject">
+    <object name="PrintCompositor" cname="GtkSourcePrintCompositor" parent="GObject">
       <class_struct cname="GtkSourcePrintCompositorClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -2190,7 +2190,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceSearchContext" cname="GtkSourceSearchContext" parent="GObject">
+    <object name="SearchContext" cname="GtkSourceSearchContext" parent="GObject">
       <class_struct cname="GtkSourceSearchContextClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -2323,7 +2323,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceSearchSettings" cname="GtkSourceSearchSettings" parent="GObject">
+    <object name="SearchSettings" cname="GtkSourceSearchSettings" parent="GObject">
       <class_struct cname="GtkSourceSearchSettingsClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -2384,7 +2384,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceSpaceDrawer" cname="GtkSourceSpaceDrawer" parent="GObject">
+    <object name="SpaceDrawer" cname="GtkSourceSpaceDrawer" parent="GObject">
       <class_struct cname="GtkSourceSpaceDrawerClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="20" />
@@ -2436,7 +2436,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceStyle" cname="GtkSourceStyle" parent="GObject">
+    <object name="Style" cname="GtkSourceStyle" parent="GObject">
       <class_struct cname="GtkSourceStyleClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
       </class_struct>
@@ -2471,7 +2471,7 @@
         <return-type type="GType" />
       </method>
     </object>
-    <object name="GtkSourceStyleScheme" cname="GtkSourceStyleScheme" parent="GObject">
+    <object name="StyleScheme" cname="GtkSourceStyleScheme" parent="GObject">
       <class_struct cname="GtkSourceStyleSchemeClass">
         <field name="BaseClass" cname="base_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -2506,7 +2506,7 @@
         <return-type type="GType" />
       </method>
     </object>
-    <object name="GtkSourceStyleSchemeChooserButton" cname="GtkSourceStyleSchemeChooserButton" parent="GtkButton">
+    <object name="StyleSchemeChooserButton" cname="GtkSourceStyleSchemeChooserButton" parent="GtkButton">
       <class_struct cname="GtkSourceStyleSchemeChooserButtonClass">
         <field name="Parent" cname="parent" type="GtkButtonClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -2519,7 +2519,7 @@
       </method>
       <constructor cname="gtk_source_style_scheme_chooser_button_new" />
     </object>
-    <object name="GtkSourceStyleSchemeChooserWidget" cname="GtkSourceStyleSchemeChooserWidget" parent="GtkBin">
+    <object name="StyleSchemeChooserWidget" cname="GtkSourceStyleSchemeChooserWidget" parent="GtkBin">
       <class_struct cname="GtkSourceStyleSchemeChooserWidgetClass">
         <field name="Parent" cname="parent" type="GtkBinClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -2532,7 +2532,7 @@
       </method>
       <constructor cname="gtk_source_style_scheme_chooser_widget_new" />
     </object>
-    <object name="GtkSourceStyleSchemeManager" cname="GtkSourceStyleSchemeManager" parent="GObject">
+    <object name="StyleSchemeManager" cname="GtkSourceStyleSchemeManager" parent="GObject">
       <class_struct cname="GtkSourceStyleSchemeManagerClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
         <field name="Padding" cname="padding" type="gpointer" array_len="10" />
@@ -2581,7 +2581,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceUndoManagerDefault" cname="GtkSourceUndoManagerDefault" parent="GObject">
+    <object name="UndoManagerDefault" cname="GtkSourceUndoManagerDefault" parent="GObject">
       <class_struct cname="GtkSourceUndoManagerDefaultClass">
         <field name="ParentClass" cname="parent_class" type="GObjectClass" />
       </class_struct>
@@ -2601,7 +2601,7 @@
         </parameters>
       </method>
     </object>
-    <object name="GtkSourceView" cname="GtkSourceView" parent="GtkTextView">
+    <object name="View" cname="GtkSourceView" parent="GtkTextView">
       <class_struct cname="GtkSourceViewClass">
         <field name="ParentClass" cname="parent_class" type="GtkTextViewClass" />
         <method signal_vm="undo" />
@@ -2874,7 +2874,7 @@
     <struct name="ContextPtr" cname="ContextPtr" opaque="true" />
     <struct name="DefinitionChild" cname="DefinitionChild" opaque="true" />
     <struct name="DefinitionsIter" cname="DefinitionsIter" opaque="true" />
-    <struct name="GtkSourceContextClass" cname="GtkSourceContextClass" opaque="true">
+    <struct name="ContextClass" cname="GtkSourceContextClass" opaque="true">
       <method name="Free" cname="gtk_source_context_class_free">
         <return-type type="void" />
       </method>
@@ -2885,9 +2885,9 @@
         </parameters>
       </constructor>
     </struct>
-    <struct name="GtkSourceContextData" cname="GtkSourceContextData" opaque="true" />
-    <struct name="GtkSourceContextReplace" cname="GtkSourceContextReplace" opaque="true" />
-    <boxed name="GtkSourceEncoding" cname="GtkSourceEncoding" opaque="true">
+    <struct name="ContextData" cname="GtkSourceContextData" opaque="true" />
+    <struct name="ContextReplace" cname="GtkSourceContextReplace" opaque="true" />
+    <boxed name="Encoding" cname="GtkSourceEncoding" opaque="true">
       <method name="Copy" cname="gtk_source_encoding_copy">
         <return-type type="GtkSourceEncoding*" owned="true" />
       </method>
@@ -2925,7 +2925,7 @@
         <return-type type="gchar*" />
       </method>
     </boxed>
-    <struct name="GtkSourcePixbufHelper" cname="GtkSourcePixbufHelper" opaque="true">
+    <struct name="PixbufHelper" cname="GtkSourcePixbufHelper" opaque="true">
       <method name="Free" cname="gtk_source_pixbuf_helper_free">
         <return-type type="void" />
       </method>
@@ -2965,8 +2965,8 @@
         </parameters>
       </method>
     </struct>
-    <struct name="GtkSourceRegex" cname="GtkSourceRegex" opaque="true" />
-    <struct name="GtkSourceRegionIter" cname="GtkSourceRegionIter">
+    <struct name="Regex" cname="GtkSourceRegex" opaque="true" />
+    <struct name="RegionIter" cname="GtkSourceRegionIter">
       <field name="Dummy1" cname="dummy1" type="gpointer" access="private" />
       <field name="Dummy2" cname="dummy2" type="guint32" access="private" />
       <field name="Dummy3" cname="dummy3" type="gpointer" access="private" />
@@ -2984,8 +2984,8 @@
         <return-type type="gboolean" />
       </method>
     </struct>
-    <struct name="GtkSourceRegionIterReal" cname="GtkSourceRegionIterReal" opaque="true" />
-    <struct name="GtkSourceStyleInfo" cname="GtkSourceStyleInfo" opaque="true" />
+    <struct name="RegionIterReal" cname="GtkSourceRegionIterReal" opaque="true" />
+    <struct name="StyleInfo" cname="GtkSourceStyleInfo" opaque="true" />
     <struct name="InvalidRegion" cname="InvalidRegion" opaque="true" />
     <struct name="LineInfo" cname="LineInfo" opaque="true" />
     <struct name="LinesInfo" cname="LinesInfo" opaque="true" />
@@ -2996,5 +2996,113 @@
     <struct name="SubPatternDefinition" cname="SubPatternDefinition" opaque="true" />
     <struct name="Subregion" cname="Subregion" opaque="true" />
     <struct name="TaskData" cname="TaskData" opaque="true" />
+    <class name="Region" cname="GtkSourceRegion_">
+      <method name="AddRegion" cname="gtk_source_region_add_region" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+          <parameter type="GtkSourceRegion*" name="region_to_add" />
+        </parameters>
+      </method>
+      <method name="AddSubregion" cname="gtk_source_region_add_subregion" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+          <parameter type="const-GtkTextIter*" name="_start" />
+          <parameter type="const-GtkTextIter*" name="_end" />
+        </parameters>
+      </method>
+      <method name="GetBounds" cname="gtk_source_region_get_bounds" shared="true">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+          <parameter type="GtkTextIter*" name="start" />
+          <parameter type="GtkTextIter*" name="end" />
+        </parameters>
+      </method>
+      <method name="GetBuffer" cname="gtk_source_region_get_buffer" shared="true">
+        <return-type type="GtkTextBuffer*" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+        </parameters>
+      </method>
+      <method name="GetStartRegionIter" cname="gtk_source_region_get_start_region_iter" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+          <parameter type="GtkSourceRegionIter*" name="iter" />
+        </parameters>
+      </method>
+      <method name="IntersectRegion" cname="gtk_source_region_intersect_region" shared="true">
+        <return-type type="GtkSourceRegion*" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region1" />
+          <parameter type="GtkSourceRegion*" name="region2" />
+        </parameters>
+      </method>
+      <method name="IntersectSubregion" cname="gtk_source_region_intersect_subregion" shared="true">
+        <return-type type="GtkSourceRegion*" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+          <parameter type="const-GtkTextIter*" name="_start" />
+          <parameter type="const-GtkTextIter*" name="_end" />
+        </parameters>
+      </method>
+      <method name="IsEmpty" cname="gtk_source_region_is_empty" shared="true">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+        </parameters>
+      </method>
+      <method name="New" cname="gtk_source_region_new" shared="true">
+        <return-type type="GtkSourceRegion*" />
+        <parameters>
+          <parameter type="GtkTextBuffer*" name="buffer" />
+        </parameters>
+      </method>
+      <method name="SubtractRegion" cname="gtk_source_region_subtract_region" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+          <parameter type="GtkSourceRegion*" name="region_to_subtract" />
+        </parameters>
+      </method>
+      <method name="SubtractSubregion" cname="gtk_source_region_subtract_subregion" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+          <parameter type="const-GtkTextIter*" name="_start" />
+          <parameter type="const-GtkTextIter*" name="_end" />
+        </parameters>
+      </method>
+      <method name="ToString" cname="gtk_source_region_to_string" shared="true">
+        <return-type type="gchar*" />
+        <parameters>
+          <parameter type="GtkSourceRegion*" name="region" />
+        </parameters>
+      </method>
+    </class>
+    <class name="Global" cname="GtkSourceGlobal">
+      <method name="TagNew" cname="gtk_source_tag_new" shared="true">
+        <return-type type="GtkTextTag*" />
+        <parameters>
+          <parameter type="const-gchar*" name="name" />
+        </parameters>
+      </method>
+    </class>
+    <class name="Utils" cname="GtkSourceUtils_">
+      <method name="EscapeSearchText" cname="gtk_source_utils_escape_search_text" shared="true">
+        <return-type type="gchar*" />
+        <parameters>
+          <parameter type="const-gchar*" name="text" />
+        </parameters>
+      </method>
+      <method name="UnescapeSearchText" cname="gtk_source_utils_unescape_search_text" shared="true">
+        <return-type type="gchar*" />
+        <parameters>
+          <parameter type="const-gchar*" name="text" />
+        </parameters>
+      </method>
+    </class>
   </namespace>
 </api>
\ No newline at end of file
diff --git a/Source/Libs/SourceView/SourceView.metadata b/Source/Libs/SourceView/SourceView.metadata
index 015d20b96..ed1fea2dd 100644
--- a/Source/Libs/SourceView/SourceView.metadata
+++ b/Source/Libs/SourceView/SourceView.metadata
@@ -4,8 +4,8 @@
   <attr path="/api/namespace/object[@cname='GtkSourceBuffer']/signal[@name='Undo']" name="name">UndoFired</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceView']/signal[@name='SmartHomeEnd']" name="name">SmartHomeEndFired</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceGutterRenderer']/signal[@name='Activate']" name="name">Activated</attr>
-  <attr path="/api/namespace/object[@name='GtkSourceView']/implements/interface[@cname='GtkBuildable']" name="hidden">true</attr>
-  <attr path="/api/namespace/object[@name='GtkSourceCompletion']/implements/interface[@cname='GtkBuildable']" name="hidden">true</attr>
+  <attr path="/api/namespace/object[@cname='GtkSourceView']/implements/interface[@cname='GtkBuildable']" name="hidden">true</attr>
+  <attr path="/api/namespace/object[@cname='GtkSourceCompletion']/implements/interface[@cname='GtkBuildable']" name="hidden">true</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceCompletion']/signal[@name='Hide']" name="name">Hidden</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceGutterRenderer']/signal[@name='QueryActivatable']" name="name">ActivatableQueried</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceGutterRenderer']/signal[@name='QueryData']" name="name">DataQueried</attr>
@@ -25,21 +25,21 @@
   <remove-node path="/api/namespace/object[@cname='GtkSourceBuffer']/method[@cname='gtk_source_buffer_can_undo']" />
   <remove-node path="/api/namespace/object[@cname='GtkSourceBuffer']/method[@cname='gtk_source_buffer_can_redo']" />
   <remove-node path="/api/namespace/interface[@cname='GtkSourceStyleSchemeChooser']/property[@cname='style-scheme']" />
-  <attr path="/api/namespace" name="library">Library.Source</attr>
-  <attr path="/api/namespace/object[@cname='GtkSourceBuffer']/method[@cname='gtk_source_buffer_get_source_marks_at_iter']/return-type" name="element_type">GtkSourceMark</attr>
-  <attr path="/api/namespace/object[@cname='GtkSourceBuffer']/method[@cname='gtk_source_buffer_get_source_marks_at_line']/return-type" name="element_type">GtkSourceMark</attr>
-  <attr path="/api/namespace/object[@cname='GtkSourceCompletion']/method[@cname='gtk_source_completion_get_providers']/return-type" name="element_type">GtkSourceCompletionProvider</attr>
-  <attr path="/api/namespace/boxed[@cname='GtkSourceEncoding']/method[@cname='gtk_source_encoding_get_all']/return-type" name="element_type">GtkSourceEncoding</attr>
-  <attr path="/api/namespace/boxed[@cname='GtkSourceEncoding']/method[@cname='gtk_source_encoding_get_default_candidates']/return-type" name="element_type">GtkSourceEncoding</attr>
+  <attr path="/api/namespace/object[@cname='GtkSourceBuffer']/method[@cname='gtk_source_buffer_get_source_marks_at_iter']/return-type" name="element_type">Mark</attr>
+  <attr path="/api/namespace/object[@cname='GtkSourceBuffer']/method[@cname='gtk_source_buffer_get_source_marks_at_line']/return-type" name="element_type">Mark</attr>
+  <attr path="/api/namespace/object[@cname='GtkSourceCompletion']/method[@cname='gtk_source_completion_get_providers']/return-type" name="element_type">CompletionProvider</attr>
+  <attr path="/api/namespace/boxed[@cname='GtkSourceEncoding']/method[@cname='gtk_source_encoding_get_all']/return-type" name="element_type">Encoding</attr>
+  <attr path="/api/namespace/boxed[@cname='GtkSourceEncoding']/method[@cname='gtk_source_encoding_get_default_candidates']/return-type" name="element_type">Encoding</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceFileLoader']/method[@cname='gtk_source_file_loader_load_async']/parameters/parameter[@name='progress_callback']" name="scope">notify</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceFileLoader']/method[@cname='gtk_source_file_loader_load_async']/parameters/parameter[@name='callback']" name="scope">async</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceFileSaver']/method[@cname='gtk_source_file_saver_save_async']/parameters/parameter[@name='progress_callback']" name="scope">notify</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceFileSaver']/method[@cname='gtk_source_file_saver_save_async']/parameters/parameter[@name='callback']" name="scope">async</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceSearchContext']/method[@cname='gtk_source_search_context_backward_async']/parameters/parameter[@name='callback']" name="scope">async</attr>
   <attr path="/api/namespace/object[@cname='GtkSourceSearchContext']/method[@cname='gtk_source_search_context_forward_async']/parameters/parameter[@name='callback']" name="scope">async</attr>
-
+  <!-- Rename View to SourceView -->
+  <attr path="/api/namespace/object[@cname='GtkSourceView']" name="name">SourceView</attr>
   <!-- This is a variadic function. Unsure how we're supposed to handle it in the binding. For now I've removed it. -->
   <attr path="/api/namespace/object[@cname='GtkSourceBuffer']/method[@cname='gtk_source_buffer_create_source_tag']" name="hidden">1</attr>
-
   <add-node path="/api"><symbol type="ownable" cname="variant" name="GLib.Variant"/></add-node>
+  <attr path="/api/namespace" name="library">Library.GtkSource</attr>
 </metadata>
\ No newline at end of file
diff --git a/Source/Libs/SourceView/SourceView.source b/Source/Libs/SourceView/SourceView.source
index e1730d22c..81c3d64d8 100644
--- a/Source/Libs/SourceView/SourceView.source
+++ b/Source/Libs/SourceView/SourceView.source
@@ -1,7 +1,7 @@
 <gapi-parser-input>
   <api filename="SourceView-api.xml">
     <library name="libgtksourceview-4.so">
-      <namespace name="Gtk.Source">
+      <namespace name="GtkSource">
         <dir>gtksourceview-4.0.0/gtksourceview</dir>
       </namespace>
     </library>
diff --git a/Source/Libs/SourceView/generate.sh b/Source/Libs/SourceView/generate.sh
index 35a7172ed..36bb9827c 100755
--- a/Source/Libs/SourceView/generate.sh
+++ b/Source/Libs/SourceView/generate.sh
@@ -2,7 +2,6 @@
 outdir=Generated
 sourcever=4.0.0
 
-clear
 wget http://ftp.acc.umu.se/pub/GNOME/sources/gtksourceview/4.0/gtksourceview-$sourcever.tar.xz
 tar xf gtksourceview-$sourcever.tar.xz
 
@@ -13,9 +12,5 @@ fi
 
 ../../OldStuff/parser/gapi3-parser SourceView.source
 
-dotnet ../../../BuildOutput/Tools/GapiFixup.dll --api=SourceView-api.xml --metadata=SourceView.metadata
-dotnet ../../../BuildOutput/Tools/GapiCodegen.dll --outdir=$outdir --assembly-name=SourceView `pkg-config --cflags gtk-sharp-3.0` --generate SourceView-api.xml
-dotnet build -v m
-
 rm gtksourceview-$sourcever.tar.xz
 rm -rf gtksourceview-$sourcever
diff --git a/Source/Samples/MainWindow.cs b/Source/Samples/MainWindow.cs
index 724a78d6f..2518c7796 100644
--- a/Source/Samples/MainWindow.cs
+++ b/Source/Samples/MainWindow.cs
@@ -2,7 +2,7 @@
 // Happy coding!!! - GtkSharp Team
 
 using Gtk;
-using Gtk.Source;
+using GtkSource;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -56,7 +56,7 @@ namespace Samples
             _notebook.AppendPage(scroll1, new Label { Text = "Data", Expand = true });
 
             var scroll2 = new ScrolledWindow();
-            _textViewCode = new GtkSourceView();
+            _textViewCode = new SourceView();
             _textViewCode.Margin = 3;
             scroll2.Child = _textViewCode;
             _notebook.AppendPage(scroll2, new Label { Text = "Code", Expand = true });