[gtksourceview/wip/chergert/rename: 1/3] rename files to use dashes



commit cc7ed672684660073d50915cf559fc51bd2b2514
Author: Christian Hergert <chergert redhat com>
Date:   Mon Aug 26 15:32:34 2019 +0300

    rename files to use dashes
    
    This is convenient for lots of tooling that can help refactor code
    based on filenames. It makes it more clear for casual readers what
    the wording is.
    
    While it breaks from the convention that glib/gtk do, it matches the
    rest of our ecosystem much better.

 .../words/gtksourcecompletionwords.h               |   2 +-
 .../words/gtksourcecompletionwordsbuffer.c         |   2 +-
 .../words/gtksourcecompletionwordsproposal.h       |   4 +-
 ...utstream.c => gtk-source-buffer-input-stream.c} |   2 +-
 ...utstream.h => gtk-source-buffer-input-stream.h} |   6 +-
 ...fferinternal.c => gtk-source-buffer-internal.c} |   6 +-
 ...fferinternal.h => gtk-source-buffer-internal.h} |   4 +-
 ...tstream.c => gtk-source-buffer-output-stream.c} |  10 +-
 ...tstream.h => gtk-source-buffer-output-stream.h} |   8 +-
 ...uffer-private.h => gtk-source-buffer-private.h} |   4 +-
 .../{gtksourcebuffer.c => gtk-source-buffer.c}     |  26 +--
 .../{gtksourcebuffer.h => gtk-source-buffer.h}     |   2 +-
 ...ntainer.c => gtk-source-completion-container.c} |   2 +-
 ...ntainer.h => gtk-source-completion-container.h} |   2 +-
 ...oncontext.c => gtk-source-completion-context.c} |   6 +-
 ...oncontext.h => gtk-source-completion-context.h} |   2 +-
 ...mpletioninfo.c => gtk-source-completion-info.c} |   2 +-
 ...mpletioninfo.h => gtk-source-completion-info.h} |   2 +-
 ...mpletionitem.c => gtk-source-completion-item.c} |   4 +-
 ...mpletionitem.h => gtk-source-completion-item.h} |   2 +-
 ...letionmodel.c => gtk-source-completion-model.c} |   6 +-
 ...letionmodel.h => gtk-source-completion-model.h} |   4 +-
 ...n-private.h => gtk-source-completion-private.h} |   2 +-
 ...proposal.c => gtk-source-completion-proposal.c} |   2 +-
 ...proposal.h => gtk-source-completion-proposal.h} |   2 +-
 ...provider.c => gtk-source-completion-provider.c} |   6 +-
 ...provider.h => gtk-source-completion-provider.h} |   4 +-
 ...ksourcecompletion.c => gtk-source-completion.c} |  22 +--
 ...ksourcecompletion.h => gtk-source-completion.h} |   2 +-
 ...ourcecompletion.ui => gtk-source-completion.ui} |   0
 ...contextengine.c => gtk-source-context-engine.c} |  18 +--
 ...contextengine.h => gtk-source-context-engine.h} |   6 +-
 ...ing-private.h => gtk-source-encoding-private.h} |   2 +-
 .../{gtksourceencoding.c => gtk-source-encoding.c} |   6 +-
 .../{gtksourceencoding.h => gtk-source-encoding.h} |   2 +-
 .../{gtksourceengine.c => gtk-source-engine.c}     |   4 +-
 .../{gtksourceengine.h => gtk-source-engine.h}     |   4 +-
 ...sourcefileloader.c => gtk-source-file-loader.c} |  12 +-
 ...sourcefileloader.h => gtk-source-file-loader.h} |   4 +-
 ...tksourcefilesaver.c => gtk-source-file-saver.c} |  12 +-
 ...tksourcefilesaver.h => gtk-source-file-saver.h} |   4 +-
 .../{gtksourcefile.c => gtk-source-file.c}         |   4 +-
 .../{gtksourcefile.h => gtk-source-file.h}         |   2 +-
 ...utter-private.h => gtk-source-gutter-private.h} |   2 +-
 ...rlines.c => gtk-source-gutter-renderer-lines.c} |   6 +-
 ...rlines.h => gtk-source-gutter-renderer-lines.h} |   6 +-
 ...rmarks.c => gtk-source-gutter-renderer-marks.c} |  10 +-
 ...rmarks.h => gtk-source-gutter-renderer-marks.h} |   6 +-
 ...ixbuf.c => gtk-source-gutter-renderer-pixbuf.c} |   4 +-
 ...ixbuf.h => gtk-source-gutter-renderer-pixbuf.h} |   4 +-
 ...vate.h => gtk-source-gutter-renderer-private.h} |   2 +-
 ...rertext.c => gtk-source-gutter-renderer-text.c} |   2 +-
 ...rertext.h => gtk-source-gutter-renderer-text.h} |   4 +-
 ...tterrenderer.c => gtk-source-gutter-renderer.c} |   8 +-
 ...tterrenderer.h => gtk-source-gutter-renderer.h} |   2 +-
 .../{gtksourcegutter.c => gtk-source-gutter.c}     |  10 +-
 .../{gtksourcegutter.h => gtk-source-gutter.h}     |   2 +-
 .../{gtksourceinit.c => gtk-source-init.c}         |   6 +-
 .../{gtksourceinit.h => gtk-source-init.h}         |   0
 .../{gtksourceiter.c => gtk-source-iter.c}         |   2 +-
 .../{gtksourceiter.h => gtk-source-iter.h}         |   2 +-
 ...uagemanager.c => gtk-source-language-manager.c} |   8 +-
 ...uagemanager.h => gtk-source-language-manager.h} |   2 +-
 ...age-parser-2.c => gtk-source-language-parser.c} |   8 +-
 ...age-private.h => gtk-source-language-private.h} |   4 +-
 .../{gtksourcelanguage.c => gtk-source-language.c} |   6 +-
 .../{gtksourcelanguage.h => gtk-source-language.h} |   2 +-
 gtksourceview/{gtksourcemap.c => gtk-source-map.c} |  12 +-
 gtksourceview/{gtksourcemap.h => gtk-source-map.h} |   4 +-
 ...rkattributes.c => gtk-source-mark-attributes.c} |   6 +-
 ...rkattributes.h => gtk-source-mark-attributes.h} |   2 +-
 .../{gtksourcemark.c => gtk-source-mark.c}         |   6 +-
 .../{gtksourcemark.h => gtk-source-mark.h}         |   2 +-
 ...markssequence.c => gtk-source-marks-sequence.c} |   2 +-
 ...markssequence.h => gtk-source-marks-sequence.h} |   2 +-
 ...cepixbufhelper.c => gtk-source-pixbuf-helper.c} |   2 +-
 ...cepixbufhelper.h => gtk-source-pixbuf-helper.h} |   2 +-
 ...tcompositor.c => gtk-source-print-compositor.c} |   8 +-
 ...tcompositor.h => gtk-source-print-compositor.h} |   2 +-
 .../{gtksourceregex.c => gtk-source-regex.c}       |   4 +-
 .../{gtksourceregex.h => gtk-source-regex.h}       |   2 +-
 .../{gtksourceregion.c => gtk-source-region.c}     |   4 +-
 .../{gtksourceregion.h => gtk-source-region.h}     |   2 +-
 ...searchcontext.c => gtk-source-search-context.c} |  20 +--
 ...searchcontext.h => gtk-source-search-context.h} |   2 +-
 ...archsettings.c => gtk-source-search-settings.c} |   2 +-
 ...archsettings.h => gtk-source-search-settings.h} |   2 +-
 ...private.h => gtk-source-space-drawer-private.h} |   4 +-
 ...urcespacedrawer.c => gtk-source-space-drawer.c} |  16 +-
 ...urcespacedrawer.h => gtk-source-space-drawer.h} |   2 +-
 ...estyle-private.h => gtk-source-style-private.h} |   0
 ....c => gtk-source-style-scheme-chooser-button.c} |   8 +-
 ....h => gtk-source-style-scheme-chooser-button.h} |   2 +-
 ....c => gtk-source-style-scheme-chooser-widget.c} |  16 +-
 ....h => gtk-source-style-scheme-chooser-widget.h} |   2 +-
 ...chooser.c => gtk-source-style-scheme-chooser.c} |   4 +-
 ...chooser.h => gtk-source-style-scheme-chooser.h} |   2 +-
 ...manager.c => gtk-source-style-scheme-manager.c} |   6 +-
 ...manager.h => gtk-source-style-scheme-manager.h} |   2 +-
 ...urcestylescheme.c => gtk-source-style-scheme.c} |  12 +-
 ...urcestylescheme.h => gtk-source-style-scheme.h} |   2 +-
 .../{gtksourcestyle.c => gtk-source-style.c}       |   4 +-
 .../{gtksourcestyle.h => gtk-source-style.h}       |   2 +-
 gtksourceview/{gtksourcetag.c => gtk-source-tag.c} |   2 +-
 gtksourceview/{gtksourcetag.h => gtk-source-tag.h} |   2 +-
 ...etypes-private.h => gtk-source-types-private.h} |   0
 .../{gtksourcetypes.h => gtk-source-types.h}       |   0
 ...default.c => gtk-source-undo-manager-default.c} |   4 +-
 ...default.h => gtk-source-undo-manager-default.h} |   2 +-
 ...urceundomanager.c => gtk-source-undo-manager.c} |   2 +-
 ...urceundomanager.h => gtk-source-undo-manager.h} |   2 +-
 ...eutils-private.h => gtk-source-utils-private.h} |   0
 .../{gtksourceutils.c => gtk-source-utils.c}       |   4 +-
 .../{gtksourceutils.h => gtk-source-utils.h}       |   0
 .../{gtksourceversion.c => gtk-source-version.c}   |   0
 .../{gtksourceview.c => gtk-source-view.c}         |  36 ++---
 .../{gtksourceview.h => gtk-source-view.h}         |   2 +-
 gtksourceview/gtksource.h                          |  74 ++++-----
 gtksourceview/gtksourceautocleanups.h              |   2 +-
 gtksourceview/gtksourceview.gresource.xml          |   2 +-
 gtksourceview/meson.build                          | 178 ++++++++++-----------
 tests/test-int2str.c                               |   2 +-
 testsuite/test-buffer-input-stream.c               |   2 +-
 testsuite/test-buffer-output-stream.c              |   2 +-
 testsuite/test-buffer.c                            |   2 +-
 testsuite/test-completion-model.c                  |   2 +-
 testsuite/test-encoding.c                          |   2 +-
 testsuite/test-iter.c                              |   2 +-
 testsuite/test-regex.c                             |   2 +-
 129 files changed, 418 insertions(+), 418 deletions(-)
---
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
index 499cd1e3..fc5c6db7 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
@@ -25,7 +25,7 @@
 #error "Only <gtksourceview/gtksource.h> can be included directly."
 #endif
 
-#include <gtksourceview/gtksourcecompletionprovider.h>
+#include <gtksourceview/gtk-source-completion-provider.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c 
b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c
index 693daa2c..5e17fdc5 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c
@@ -25,7 +25,7 @@
 
 #include "gtksourcecompletionwordsbuffer.h"
 #include "gtksourcecompletionwordsutils.h"
-#include "gtksourceview/gtksourceregion.h"
+#include "gtksourceview/gtk-source-region.h"
 
 /* Timeout in seconds */
 #define INITIATE_SCAN_TIMEOUT 5
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h 
b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
index 117eabaa..d1e4dd8e 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
@@ -22,9 +22,9 @@
 #define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_H
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcecompletionproposal.h>
+#include <gtksourceview/gtk-source-completion-proposal.h>
 
-#include "gtksourceview/gtksourcetypes-private.h"
+#include "gtksourceview/gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcebufferinputstream.c b/gtksourceview/gtk-source-buffer-input-stream.c
similarity index 99%
rename from gtksourceview/gtksourcebufferinputstream.c
rename to gtksourceview/gtk-source-buffer-input-stream.c
index 1174222c..9fa1f6c4 100644
--- a/gtksourceview/gtksourcebufferinputstream.c
+++ b/gtksourceview/gtk-source-buffer-input-stream.c
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <string.h>
-#include "gtksourcebufferinputstream.h"
+#include "gtk-source-buffer-input-stream.h"
 #include "gtksource-enumtypes.h"
 
 /* NOTE: never use async methods on this stream, the stream is just
diff --git a/gtksourceview/gtksourcebufferinputstream.h b/gtksourceview/gtk-source-buffer-input-stream.h
similarity index 96%
rename from gtksourceview/gtksourcebufferinputstream.h
rename to gtksourceview/gtk-source-buffer-input-stream.h
index f98cb64c..7f0743f9 100644
--- a/gtksourceview/gtksourcebufferinputstream.h
+++ b/gtksourceview/gtk-source-buffer-input-stream.h
@@ -24,9 +24,9 @@
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include "gtksourcetypes-private.h"
-#include "gtksourcebuffer.h"
-#include "gtksourcefile.h"
+#include "gtk-source-types-private.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-file.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcebufferinternal.c b/gtksourceview/gtk-source-buffer-internal.c
similarity index 97%
rename from gtksourceview/gtksourcebufferinternal.c
rename to gtksourceview/gtk-source-buffer-internal.c
index a41d17c8..775ec8c6 100644
--- a/gtksourceview/gtksourcebufferinternal.c
+++ b/gtksourceview/gtk-source-buffer-internal.c
@@ -22,10 +22,10 @@
 #include <config.h>
 #endif
 
-#include "gtksourcebufferinternal.h"
-#include "gtksourcebuffer.h"
+#include "gtk-source-buffer-internal.h"
+#include "gtk-source-buffer.h"
 #include "gtksource-marshal.h"
-#include "gtksourcesearchcontext.h"
+#include "gtk-source-search-context.h"
 
 /* A private extension of GtkSourceBuffer, to add private signals and
  * properties.
diff --git a/gtksourceview/gtksourcebufferinternal.h b/gtksourceview/gtk-source-buffer-internal.h
similarity index 95%
rename from gtksourceview/gtksourcebufferinternal.h
rename to gtksourceview/gtk-source-buffer-internal.h
index 856d320e..32c54741 100644
--- a/gtksourceview/gtksourcebufferinternal.h
+++ b/gtksourceview/gtk-source-buffer-internal.h
@@ -22,8 +22,8 @@
 #define GTK_SOURCE_BUFFER_INTERNAL_H
 
 #include <glib-object.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcebufferoutputstream.c b/gtksourceview/gtk-source-buffer-output-stream.c
similarity index 99%
rename from gtksourceview/gtksourcebufferoutputstream.c
rename to gtksourceview/gtk-source-buffer-output-stream.c
index 77a2a113..1e195a72 100644
--- a/gtksourceview/gtksourcebufferoutputstream.c
+++ b/gtksourceview/gtk-source-buffer-output-stream.c
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include "gtksourcebufferoutputstream.h"
+#include "gtk-source-buffer-output-stream.h"
 #include <string.h>
 #include <errno.h>
 #include <glib/gi18n-lib.h>
-#include "gtksourcebuffer.h"
-#include "gtksourcebuffer-private.h"
-#include "gtksourceencoding.h"
-#include "gtksourcefileloader.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-buffer-private.h"
+#include "gtk-source-encoding.h"
+#include "gtk-source-file-loader.h"
 
 /* NOTE: never use async methods on this stream, the stream is just
  * a wrapper around GtkTextBuffer api so that we can use GIO Stream
diff --git a/gtksourceview/gtksourcebufferoutputstream.h b/gtksourceview/gtk-source-buffer-output-stream.h
similarity index 95%
rename from gtksourceview/gtksourcebufferoutputstream.h
rename to gtksourceview/gtk-source-buffer-output-stream.h
index f1a16fd9..d9668fda 100644
--- a/gtksourceview/gtksourcebufferoutputstream.h
+++ b/gtksourceview/gtk-source-buffer-output-stream.h
@@ -23,10 +23,10 @@
 #define GTK_SOURCE_BUFFER_OUTPUT_STREAM_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
-#include "gtksourcebuffer.h"
-#include "gtksourcefile.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-file.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcebuffer-private.h b/gtksourceview/gtk-source-buffer-private.h
similarity index 97%
rename from gtksourceview/gtksourcebuffer-private.h
rename to gtksourceview/gtk-source-buffer-private.h
index 51a6a310..0569a8b3 100644
--- a/gtksourceview/gtksourcebuffer-private.h
+++ b/gtksourceview/gtk-source-buffer-private.h
@@ -22,8 +22,8 @@
 #define GTK_SOURCE_BUFFER_PRIVATE_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtk-source-buffer.c
similarity index 99%
rename from gtksourceview/gtksourcebuffer.c
rename to gtksourceview/gtk-source-buffer.c
index 2341a6b3..b6846be6 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtk-source-buffer.c
@@ -26,25 +26,25 @@
 #include <config.h>
 #endif
 
-#include "gtksourcebuffer.h"
-#include "gtksourcebuffer-private.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-buffer-private.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
-#include "gtksourcelanguage.h"
-#include "gtksourcelanguage-private.h"
+#include "gtk-source-language.h"
+#include "gtk-source-language-private.h"
 #include "gtksource-marshal.h"
-#include "gtksourceundomanager.h"
-#include "gtksourceundomanagerdefault.h"
-#include "gtksourcestyle.h"
-#include "gtksourcestylescheme.h"
-#include "gtksourcestyleschememanager.h"
-#include "gtksourcemark.h"
-#include "gtksourcemarkssequence.h"
-#include "gtksourcesearchcontext.h"
-#include "gtksourcetag.h"
+#include "gtk-source-undo-manager.h"
+#include "gtk-source-undo-manager-default.h"
+#include "gtk-source-style.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-style-scheme-manager.h"
+#include "gtk-source-mark.h"
+#include "gtk-source-marks-sequence.h"
+#include "gtk-source-search-context.h"
+#include "gtk-source-tag.h"
 #include "gtksource-enumtypes.h"
 
 /**
diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtk-source-buffer.h
similarity index 99%
rename from gtksourceview/gtksourcebuffer.h
rename to gtksourceview/gtk-source-buffer.h
index 09143a87..561b5097 100644
--- a/gtksourceview/gtksourcebuffer.h
+++ b/gtksourceview/gtk-source-buffer.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletioncontainer.c b/gtksourceview/gtk-source-completion-container.c
similarity index 99%
rename from gtksourceview/gtksourcecompletioncontainer.c
rename to gtksourceview/gtk-source-completion-container.c
index 06a90a3d..92183803 100644
--- a/gtksourceview/gtksourcecompletioncontainer.c
+++ b/gtksourceview/gtk-source-completion-container.c
@@ -33,7 +33,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecompletioncontainer.h"
+#include "gtk-source-completion-container.h"
 
 #define UNREALIZED_WIDTH  350
 #define MAX_HEIGHT        180
diff --git a/gtksourceview/gtksourcecompletioncontainer.h b/gtksourceview/gtk-source-completion-container.h
similarity index 98%
rename from gtksourceview/gtksourcecompletioncontainer.h
rename to gtksourceview/gtk-source-completion-container.h
index 7f262cc1..f53dab5d 100644
--- a/gtksourceview/gtksourcecompletioncontainer.h
+++ b/gtksourceview/gtk-source-completion-container.h
@@ -22,7 +22,7 @@
 #define GTK_SOURCE_COMPLETION_CONTAINER_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtk-source-completion-context.c
similarity index 99%
rename from gtksourceview/gtksourcecompletioncontext.c
rename to gtksourceview/gtk-source-completion-context.c
index 0c31956e..79130d97 100644
--- a/gtksourceview/gtksourcecompletioncontext.c
+++ b/gtksourceview/gtk-source-completion-context.c
@@ -63,10 +63,10 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecompletioncontext.h"
+#include "gtk-source-completion-context.h"
 #include "gtksource-enumtypes.h"
-#include "gtksourcecompletionprovider.h"
-#include "gtksourcecompletion.h"
+#include "gtk-source-completion-provider.h"
+#include "gtk-source-completion.h"
 
 struct _GtkSourceCompletionContextPrivate
 {
diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtk-source-completion-context.h
similarity index 98%
rename from gtksourceview/gtksourcecompletioncontext.h
rename to gtksourceview/gtk-source-completion-context.h
index c4d146b7..29de9637 100644
--- a/gtksourceview/gtksourcecompletioncontext.h
+++ b/gtksourceview/gtk-source-completion-context.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtk-source-completion-info.c
similarity index 99%
rename from gtksourceview/gtksourcecompletioninfo.c
rename to gtksourceview/gtk-source-completion-info.c
index 957d6a5c..6b4c19f7 100644
--- a/gtksourceview/gtksourcecompletioninfo.c
+++ b/gtksourceview/gtk-source-completion-info.c
@@ -59,7 +59,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecompletioninfo.h"
+#include "gtk-source-completion-info.h"
 #include <glib/gi18n-lib.h>
 
 struct _GtkSourceCompletionInfoPrivate
diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtk-source-completion-info.h
similarity index 98%
rename from gtksourceview/gtksourcecompletioninfo.h
rename to gtksourceview/gtk-source-completion-info.h
index bbd2759f..c7d3c8e1 100644
--- a/gtksourceview/gtksourcecompletioninfo.h
+++ b/gtksourceview/gtk-source-completion-info.h
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtk-source-completion-item.c
similarity index 99%
rename from gtksourceview/gtksourcecompletionitem.c
rename to gtksourceview/gtk-source-completion-item.c
index 049ff4e3..56503888 100644
--- a/gtksourceview/gtksourcecompletionitem.c
+++ b/gtksourceview/gtk-source-completion-item.c
@@ -32,8 +32,8 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecompletionitem.h"
-#include "gtksourcecompletionproposal.h"
+#include "gtk-source-completion-item.h"
+#include "gtk-source-completion-proposal.h"
 
 struct _GtkSourceCompletionItemPrivate
 {
diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtk-source-completion-item.h
similarity index 98%
rename from gtksourceview/gtksourcecompletionitem.h
rename to gtksourceview/gtk-source-completion-item.h
index 0f9e5b9c..76d43602 100644
--- a/gtksourceview/gtksourcecompletionitem.h
+++ b/gtksourceview/gtk-source-completion-item.h
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletionmodel.c b/gtksourceview/gtk-source-completion-model.c
similarity index 99%
rename from gtksourceview/gtksourcecompletionmodel.c
rename to gtksourceview/gtk-source-completion-model.c
index 73facc77..b0d50b0a 100644
--- a/gtksourceview/gtksourcecompletionmodel.c
+++ b/gtksourceview/gtk-source-completion-model.c
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecompletionmodel.h"
+#include "gtk-source-completion-model.h"
 #include <glib/gi18n-lib.h>
-#include "gtksourcecompletionprovider.h"
-#include "gtksourcecompletionproposal.h"
+#include "gtk-source-completion-provider.h"
+#include "gtk-source-completion-proposal.h"
 
 typedef struct
 {
diff --git a/gtksourceview/gtksourcecompletionmodel.h b/gtksourceview/gtk-source-completion-model.h
similarity index 98%
rename from gtksourceview/gtksourcecompletionmodel.h
rename to gtksourceview/gtk-source-completion-model.h
index 85004f00..e61ac579 100644
--- a/gtksourceview/gtksourcecompletionmodel.h
+++ b/gtksourceview/gtk-source-completion-model.h
@@ -22,8 +22,8 @@
 #define GTK_SOURCE_COMPLETION_MODEL_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletion-private.h b/gtksourceview/gtk-source-completion-private.h
similarity index 96%
rename from gtksourceview/gtksourcecompletion-private.h
rename to gtksourceview/gtk-source-completion-private.h
index 05fafb63..7575ee1b 100644
--- a/gtksourceview/gtksourcecompletion-private.h
+++ b/gtksourceview/gtk-source-completion-private.h
@@ -22,7 +22,7 @@
 #define GTK_SOURCE_COMPLETION_PIVATE_H
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_GNUC_INTERNAL
 GtkSourceCompletion *gtk_source_completion_new (GtkSourceView *source_view);
diff --git a/gtksourceview/gtksourcecompletionproposal.c b/gtksourceview/gtk-source-completion-proposal.c
similarity index 99%
rename from gtksourceview/gtksourcecompletionproposal.c
rename to gtksourceview/gtk-source-completion-proposal.c
index 54417c7b..c5b59e6a 100644
--- a/gtksourceview/gtksourcecompletionproposal.c
+++ b/gtksourceview/gtk-source-completion-proposal.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecompletionproposal.h"
+#include "gtk-source-completion-proposal.h"
 
 /**
  * SECTION:completionproposal
diff --git a/gtksourceview/gtksourcecompletionproposal.h b/gtksourceview/gtk-source-completion-proposal.h
similarity index 99%
rename from gtksourceview/gtksourcecompletionproposal.h
rename to gtksourceview/gtk-source-completion-proposal.h
index 82858798..90b1a895 100644
--- a/gtksourceview/gtksourcecompletionproposal.h
+++ b/gtksourceview/gtk-source-completion-proposal.h
@@ -28,7 +28,7 @@
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletionprovider.c b/gtksourceview/gtk-source-completion-provider.c
similarity index 99%
rename from gtksourceview/gtksourcecompletionprovider.c
rename to gtksourceview/gtk-source-completion-provider.c
index 4dfcdba5..44826f5b 100644
--- a/gtksourceview/gtksourcecompletionprovider.c
+++ b/gtksourceview/gtk-source-completion-provider.c
@@ -23,9 +23,9 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecompletionprovider.h"
-#include "gtksourcecompletionproposal.h"
-#include "gtksourcecompletioninfo.h"
+#include "gtk-source-completion-provider.h"
+#include "gtk-source-completion-proposal.h"
+#include "gtk-source-completion-info.h"
 
 /**
  * SECTION:completionprovider
diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtk-source-completion-provider.h
similarity index 98%
rename from gtksourceview/gtksourcecompletionprovider.h
rename to gtksourceview/gtk-source-completion-provider.h
index 0560e720..0696bb9c 100644
--- a/gtksourceview/gtksourcecompletionprovider.h
+++ b/gtksourceview/gtk-source-completion-provider.h
@@ -27,8 +27,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcecompletioncontext.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-completion-context.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtk-source-completion.c
similarity index 99%
rename from gtksourceview/gtksourcecompletion.c
rename to gtksourceview/gtk-source-completion.c
index 06886e3d..10d7ee04 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtk-source-completion.c
@@ -101,18 +101,18 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecompletion.h"
-#include "gtksourcecompletion-private.h"
+#include "gtk-source-completion.h"
+#include "gtk-source-completion-private.h"
 #include <glib/gi18n-lib.h>
-#include "gtksourcecompletionmodel.h"
-#include "gtksourcecompletioncontext.h"
-#include "gtksourcecompletioninfo.h"
-#include "gtksourcecompletionproposal.h"
-#include "gtksourcecompletionprovider.h"
-#include "gtksourcecompletioncontainer.h"
-#include "gtksourcebuffer.h"
+#include "gtk-source-completion-model.h"
+#include "gtk-source-completion-context.h"
+#include "gtk-source-completion-info.h"
+#include "gtk-source-completion-proposal.h"
+#include "gtk-source-completion-provider.h"
+#include "gtk-source-completion-container.h"
+#include "gtk-source-buffer.h"
 #include "gtksource-marshal.h"
-#include "gtksourceview.h"
+#include "gtk-source-view.h"
 
 enum
 {
@@ -2259,7 +2259,7 @@ gtk_source_completion_constructed (GObject *object)
        gtk_builder_expose_object (builder, "completion_container", G_OBJECT (container));
 
        gtk_builder_add_from_resource (builder,
-                                      "/org/gnome/gtksourceview/ui/gtksourcecompletion.ui",
+                                      "/org/gnome/gtksourceview/ui/gtk-source-completion.ui",
                                       &error);
 
        if (error != NULL)
diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtk-source-completion.h
similarity index 99%
rename from gtksourceview/gtksourcecompletion.h
rename to gtksourceview/gtk-source-completion.h
index a5dfd924..cefd6cd5 100644
--- a/gtksourceview/gtksourcecompletion.h
+++ b/gtksourceview/gtk-source-completion.h
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcecompletion.ui b/gtksourceview/gtk-source-completion.ui
similarity index 100%
rename from gtksourceview/gtksourcecompletion.ui
rename to gtksourceview/gtk-source-completion.ui
diff --git a/gtksourceview/gtksourcecontextengine.c b/gtksourceview/gtk-source-context-engine.c
similarity index 99%
rename from gtksourceview/gtksourcecontextengine.c
rename to gtksourceview/gtk-source-context-engine.c
index 13554f8f..1b9c8eaa 100644
--- a/gtksourceview/gtksourcecontextengine.c
+++ b/gtksourceview/gtk-source-context-engine.c
@@ -23,18 +23,18 @@
 #include <config.h>
 #endif
 
-#include "gtksourcecontextengine.h"
+#include "gtk-source-context-engine.h"
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n-lib.h>
-#include "gtksourceregion.h"
-#include "gtksourcelanguage.h"
-#include "gtksourcelanguage-private.h"
-#include "gtksourcebuffer.h"
-#include "gtksourceregex.h"
-#include "gtksourcestyle.h"
-#include "gtksourcestylescheme.h"
-#include "gtksourceutils-private.h"
+#include "gtk-source-region.h"
+#include "gtk-source-language.h"
+#include "gtk-source-language-private.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-regex.h"
+#include "gtk-source-style.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-utils-private.h"
 
 #undef ENABLE_DEBUG
 #undef ENABLE_PROFILE
diff --git a/gtksourceview/gtksourcecontextengine.h b/gtksourceview/gtk-source-context-engine.h
similarity index 98%
rename from gtksourceview/gtksourcecontextengine.h
rename to gtksourceview/gtk-source-context-engine.h
index 147e2ba3..1de1c029 100644
--- a/gtksourceview/gtksourcecontextengine.h
+++ b/gtksourceview/gtk-source-context-engine.h
@@ -22,9 +22,9 @@
 #ifndef GTK_SOURCE_CONTEXT_ENGINE_H
 #define GTK_SOURCE_CONTEXT_ENGINE_H
 
-#include "gtksourceengine.h"
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
+#include "gtk-source-engine.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceencoding-private.h b/gtksourceview/gtk-source-encoding-private.h
similarity index 97%
rename from gtksourceview/gtksourceencoding-private.h
rename to gtksourceview/gtk-source-encoding-private.h
index cd9e73db..19c68541 100644
--- a/gtksourceview/gtksourceencoding-private.h
+++ b/gtksourceview/gtk-source-encoding-private.h
@@ -22,7 +22,7 @@
 #define GTK_SOURCE_ENCODING_PRIVATE_H
 
 #include <glib.h>
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceencoding.c b/gtksourceview/gtk-source-encoding.c
similarity index 99%
rename from gtksourceview/gtksourceencoding.c
rename to gtksourceview/gtk-source-encoding.c
index 5e5cdeb3..6b049a82 100644
--- a/gtksourceview/gtksourceencoding.c
+++ b/gtksourceview/gtk-source-encoding.c
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
-#include "gtksourceencoding.h"
-#include "gtksourceencoding-private.h"
+#include "gtk-source-encoding.h"
+#include "gtk-source-encoding-private.h"
 #include <glib/gi18n-lib.h>
 
 /**
@@ -637,7 +637,7 @@ gtk_source_encoding_get_default_candidates (void)
         * value used by GtkSourceView and it represents the encoding for the
         * current locale, so please don't translate the "CURRENT" term.  Only
         * recognized encodings are used. See
-        * https://gitlab.gnome.org/GNOME/gtksourceview/blob/master/gtksourceview/gtksourceencoding.c#L142
+        * https://gitlab.gnome.org/GNOME/gtksourceview/blob/master/gtksourceview/gtk-source-encoding.c#L142
         * for a list of supported encodings.
         * Keep the same format: square brackets, single quotes, commas.
         */
diff --git a/gtksourceview/gtksourceencoding.h b/gtksourceview/gtk-source-encoding.h
similarity index 98%
rename from gtksourceview/gtksourceencoding.h
rename to gtksourceview/gtk-source-encoding.h
index 25fb9371..c968b691 100644
--- a/gtksourceview/gtksourceencoding.h
+++ b/gtksourceview/gtk-source-encoding.h
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceengine.c b/gtksourceview/gtk-source-engine.c
similarity index 97%
rename from gtksourceview/gtksourceengine.c
rename to gtksourceview/gtk-source-engine.c
index 94ff2224..5bb7cb52 100644
--- a/gtksourceview/gtksourceengine.c
+++ b/gtksourceview/gtk-source-engine.c
@@ -24,8 +24,8 @@
 #include <config.h>
 #endif
 
-#include "gtksourceengine.h"
-#include "gtksourcestylescheme.h"
+#include "gtk-source-engine.h"
+#include "gtk-source-style-scheme.h"
 
 G_DEFINE_INTERFACE (GtkSourceEngine, _gtk_source_engine, G_TYPE_OBJECT)
 
diff --git a/gtksourceview/gtksourceengine.h b/gtksourceview/gtk-source-engine.h
similarity index 97%
rename from gtksourceview/gtksourceengine.h
rename to gtksourceview/gtk-source-engine.h
index c6ecb850..77379bbd 100644
--- a/gtksourceview/gtksourceengine.h
+++ b/gtksourceview/gtk-source-engine.h
@@ -22,8 +22,8 @@
 #define GTK_SOURCE_ENGINE_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtk-source-file-loader.c
similarity index 99%
rename from gtksourceview/gtksourcefileloader.c
rename to gtksourceview/gtk-source-file-loader.c
index 381caec3..36bcfe53 100644
--- a/gtksourceview/gtksourcefileloader.c
+++ b/gtksourceview/gtk-source-file-loader.c
@@ -25,13 +25,13 @@
 #include <config.h>
 #endif
 
-#include "gtksourcefileloader.h"
+#include "gtk-source-file-loader.h"
 #include <glib/gi18n-lib.h>
-#include "gtksourcebuffer.h"
-#include "gtksourcefile.h"
-#include "gtksourcebufferoutputstream.h"
-#include "gtksourceencoding.h"
-#include "gtksourceencoding-private.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-file.h"
+#include "gtk-source-buffer-output-stream.h"
+#include "gtk-source-encoding.h"
+#include "gtk-source-encoding-private.h"
 #include "gtksource-enumtypes.h"
 
 /**
diff --git a/gtksourceview/gtksourcefileloader.h b/gtksourceview/gtk-source-file-loader.h
similarity index 98%
rename from gtksourceview/gtksourcefileloader.h
rename to gtksourceview/gtk-source-file-loader.h
index 70fff263..e5f3cf93 100644
--- a/gtksourceview/gtksourcefileloader.h
+++ b/gtksourceview/gtk-source-file-loader.h
@@ -29,8 +29,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcefile.h>
+#include <gtksourceview/gtk-source-types.h>
+#include <gtksourceview/gtk-source-file.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcefilesaver.c b/gtksourceview/gtk-source-file-saver.c
similarity index 99%
rename from gtksourceview/gtksourcefilesaver.c
rename to gtksourceview/gtk-source-file-saver.c
index 600efc65..4e528331 100644
--- a/gtksourceview/gtksourcefilesaver.c
+++ b/gtksourceview/gtk-source-file-saver.c
@@ -25,13 +25,13 @@
 #include <config.h>
 #endif
 
-#include "gtksourcefilesaver.h"
+#include "gtk-source-file-saver.h"
 #include <glib/gi18n-lib.h>
-#include "gtksourcefile.h"
-#include "gtksourcebufferinputstream.h"
-#include "gtksourceencoding.h"
-#include "gtksourcebuffer.h"
-#include "gtksourcebuffer-private.h"
+#include "gtk-source-file.h"
+#include "gtk-source-buffer-input-stream.h"
+#include "gtk-source-encoding.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-buffer-private.h"
 #include "gtksource-enumtypes.h"
 
 /**
diff --git a/gtksourceview/gtksourcefilesaver.h b/gtksourceview/gtk-source-file-saver.h
similarity index 98%
rename from gtksourceview/gtksourcefilesaver.h
rename to gtksourceview/gtk-source-file-saver.h
index 5bb014e4..7b70a376 100644
--- a/gtksourceview/gtksourcefilesaver.h
+++ b/gtksourceview/gtk-source-file-saver.h
@@ -29,8 +29,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcefile.h>
+#include <gtksourceview/gtk-source-types.h>
+#include <gtksourceview/gtk-source-file.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcefile.c b/gtksourceview/gtk-source-file.c
similarity index 99%
rename from gtksourceview/gtksourcefile.c
rename to gtksourceview/gtk-source-file.c
index 16d60965..78fb870c 100644
--- a/gtksourceview/gtksourcefile.c
+++ b/gtksourceview/gtk-source-file.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include "gtksourcefile.h"
-#include "gtksourceencoding.h"
+#include "gtk-source-file.h"
+#include "gtk-source-encoding.h"
 #include "gtksource-enumtypes.h"
 
 /**
diff --git a/gtksourceview/gtksourcefile.h b/gtksourceview/gtk-source-file.h
similarity index 99%
rename from gtksourceview/gtksourcefile.h
rename to gtksourceview/gtk-source-file.h
index 0e6b0163..992f1810 100644
--- a/gtksourceview/gtksourcefile.h
+++ b/gtksourceview/gtk-source-file.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutter-private.h b/gtksourceview/gtk-source-gutter-private.h
similarity index 97%
rename from gtksourceview/gtksourcegutter-private.h
rename to gtksourceview/gtk-source-gutter-private.h
index 46136f84..734b1076 100644
--- a/gtksourceview/gtksourcegutter-private.h
+++ b/gtksourceview/gtk-source-gutter-private.h
@@ -22,7 +22,7 @@
 #define GTK_SOURCE_GUTTER_PRIVATE_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
+#include "gtk-source-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrendererlines.c b/gtksourceview/gtk-source-gutter-renderer-lines.c
similarity index 99%
rename from gtksourceview/gtksourcegutterrendererlines.c
rename to gtksourceview/gtk-source-gutter-renderer-lines.c
index 7c5b3020..440d399d 100644
--- a/gtksourceview/gtksourcegutterrendererlines.c
+++ b/gtksourceview/gtk-source-gutter-renderer-lines.c
@@ -22,9 +22,9 @@
 #include <config.h>
 #endif
 
-#include "gtksourcegutterrendererlines.h"
-#include "gtksourceutils-private.h"
-#include "gtksourceview.h"
+#include "gtk-source-gutter-renderer-lines.h"
+#include "gtk-source-utils-private.h"
+#include "gtk-source-view.h"
 
 struct _GtkSourceGutterRendererLinesPrivate
 {
diff --git a/gtksourceview/gtksourcegutterrendererlines.h b/gtksourceview/gtk-source-gutter-renderer-lines.h
similarity index 95%
rename from gtksourceview/gtksourcegutterrendererlines.h
rename to gtksourceview/gtk-source-gutter-renderer-lines.h
index 2fc8e22a..96eeb7aa 100644
--- a/gtksourceview/gtksourcegutterrendererlines.h
+++ b/gtksourceview/gtk-source-gutter-renderer-lines.h
@@ -22,9 +22,9 @@
 #define GTK_SOURCE_GUTTER_RENDERER_LINES_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
-#include "gtksourcegutterrenderertext.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
+#include "gtk-source-gutter-renderer-text.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrenderermarks.c b/gtksourceview/gtk-source-gutter-renderer-marks.c
similarity index 98%
rename from gtksourceview/gtksourcegutterrenderermarks.c
rename to gtksourceview/gtk-source-gutter-renderer-marks.c
index 8fdcb6df..65745aee 100644
--- a/gtksourceview/gtksourcegutterrenderermarks.c
+++ b/gtksourceview/gtk-source-gutter-renderer-marks.c
@@ -22,11 +22,11 @@
 #include <config.h>
 #endif
 
-#include "gtksourcegutterrenderermarks.h"
-#include "gtksourceview.h"
-#include "gtksourcebuffer.h"
-#include "gtksourcemarkattributes.h"
-#include "gtksourcemark.h"
+#include "gtk-source-gutter-renderer-marks.h"
+#include "gtk-source-view.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-mark-attributes.h"
+#include "gtk-source-mark.h"
 
 #define COMPOSITE_ALPHA                 225
 
diff --git a/gtksourceview/gtksourcegutterrenderermarks.h b/gtksourceview/gtk-source-gutter-renderer-marks.h
similarity index 95%
rename from gtksourceview/gtksourcegutterrenderermarks.h
rename to gtksourceview/gtk-source-gutter-renderer-marks.h
index e807f6c8..52f49dcd 100644
--- a/gtksourceview/gtksourcegutterrenderermarks.h
+++ b/gtksourceview/gtk-source-gutter-renderer-marks.h
@@ -22,9 +22,9 @@
 #define GTK_SOURCE_GUTTER_RENDERER_MARKS_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
-#include "gtksourcegutterrendererpixbuf.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
+#include "gtk-source-gutter-renderer-pixbuf.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.c b/gtksourceview/gtk-source-gutter-renderer-pixbuf.c
similarity index 99%
rename from gtksourceview/gtksourcegutterrendererpixbuf.c
rename to gtksourceview/gtk-source-gutter-renderer-pixbuf.c
index 82da75bf..f968bc5a 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.c
+++ b/gtksourceview/gtk-source-gutter-renderer-pixbuf.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include "gtksourcegutterrendererpixbuf.h"
-#include "gtksourcepixbufhelper.h"
+#include "gtk-source-gutter-renderer-pixbuf.h"
+#include "gtk-source-pixbuf-helper.h"
 
 /**
  * SECTION:gutterrendererpixbuf
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.h b/gtksourceview/gtk-source-gutter-renderer-pixbuf.h
similarity index 97%
rename from gtksourceview/gtksourcegutterrendererpixbuf.h
rename to gtksourceview/gtk-source-gutter-renderer-pixbuf.h
index 0a7ec487..5a7184e9 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.h
+++ b/gtksourceview/gtk-source-gutter-renderer-pixbuf.h
@@ -25,8 +25,8 @@
 #error "Only <gtksourceview/gtksource.h> can be included directly."
 #endif
 
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcegutterrenderer.h>
+#include <gtksourceview/gtk-source-types.h>
+#include <gtksourceview/gtk-source-gutter-renderer.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrenderer-private.h 
b/gtksourceview/gtk-source-gutter-renderer-private.h
similarity index 97%
rename from gtksourceview/gtksourcegutterrenderer-private.h
rename to gtksourceview/gtk-source-gutter-renderer-private.h
index df024bf7..4fc6a161 100644
--- a/gtksourceview/gtksourcegutterrenderer-private.h
+++ b/gtksourceview/gtk-source-gutter-renderer-private.h
@@ -22,7 +22,7 @@
 #define GTK_SOURCE_GUTTER_RENDERER_PRIVATE_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
+#include "gtk-source-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrenderertext.c b/gtksourceview/gtk-source-gutter-renderer-text.c
similarity index 99%
rename from gtksourceview/gtksourcegutterrenderertext.c
rename to gtksourceview/gtk-source-gutter-renderer-text.c
index 982cb608..0aec5b5d 100644
--- a/gtksourceview/gtksourcegutterrenderertext.c
+++ b/gtksourceview/gtk-source-gutter-renderer-text.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourcegutterrenderertext.h"
+#include "gtk-source-gutter-renderer-text.h"
 
 /**
  * SECTION:gutterrenderertext
diff --git a/gtksourceview/gtksourcegutterrenderertext.h b/gtksourceview/gtk-source-gutter-renderer-text.h
similarity index 97%
rename from gtksourceview/gtksourcegutterrenderertext.h
rename to gtksourceview/gtk-source-gutter-renderer-text.h
index 4767a24d..ef022d56 100644
--- a/gtksourceview/gtksourcegutterrenderertext.h
+++ b/gtksourceview/gtk-source-gutter-renderer-text.h
@@ -25,8 +25,8 @@
 #error "Only <gtksourceview/gtksource.h> can be included directly."
 #endif
 
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcegutterrenderer.h>
+#include <gtksourceview/gtk-source-types.h>
+#include <gtksourceview/gtk-source-gutter-renderer.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtk-source-gutter-renderer.c
similarity index 99%
rename from gtksourceview/gtksourcegutterrenderer.c
rename to gtksourceview/gtk-source-gutter-renderer.c
index 5ef7fba9..30bcc161 100644
--- a/gtksourceview/gtksourcegutterrenderer.c
+++ b/gtksourceview/gtk-source-gutter-renderer.c
@@ -22,10 +22,10 @@
 #include <config.h>
 #endif
 
-#include "gtksourcegutterrenderer.h"
-#include "gtksourcegutterrenderer-private.h"
-#include "gtksourcestylescheme.h"
-#include "gtksourceview.h"
+#include "gtk-source-gutter-renderer.h"
+#include "gtk-source-gutter-renderer-private.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-view.h"
 #include "gtksource-enumtypes.h"
 #include "gtksource-marshal.h"
 
diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtk-source-gutter-renderer.h
similarity index 99%
rename from gtksourceview/gtksourcegutterrenderer.h
rename to gtksourceview/gtk-source-gutter-renderer.h
index 4f0621c4..73c0fffb 100644
--- a/gtksourceview/gtksourcegutterrenderer.h
+++ b/gtksourceview/gtk-source-gutter-renderer.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtk-source-gutter.c
similarity index 99%
rename from gtksourceview/gtksourcegutter.c
rename to gtksourceview/gtk-source-gutter.c
index de019b8d..6b95673f 100644
--- a/gtksourceview/gtksourcegutter.c
+++ b/gtksourceview/gtk-source-gutter.c
@@ -22,11 +22,11 @@
 #include <config.h>
 #endif
 
-#include "gtksourcegutter.h"
-#include "gtksourcegutter-private.h"
-#include "gtksourceview.h"
-#include "gtksourcegutterrenderer.h"
-#include "gtksourcegutterrenderer-private.h"
+#include "gtk-source-gutter.h"
+#include "gtk-source-gutter-private.h"
+#include "gtk-source-view.h"
+#include "gtk-source-gutter-renderer.h"
+#include "gtk-source-gutter-renderer-private.h"
 
 /**
  * SECTION:gutter
diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtk-source-gutter.h
similarity index 98%
rename from gtksourceview/gtksourcegutter.h
rename to gtksourceview/gtk-source-gutter.h
index d24fcfc4..310b3117 100644
--- a/gtksourceview/gtksourcegutter.h
+++ b/gtksourceview/gtk-source-gutter.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceinit.c b/gtksourceview/gtk-source-init.c
similarity index 97%
rename from gtksourceview/gtksourceinit.c
rename to gtksourceview/gtk-source-init.c
index a802e87c..7c5bc543 100644
--- a/gtksourceview/gtksourceinit.c
+++ b/gtksourceview/gtk-source-init.c
@@ -22,10 +22,10 @@
 #include <config.h>
 #endif
 
-#include "gtksourceinit.h"
+#include "gtk-source-init.h"
 #include <glib/gi18n-lib.h>
-#include "gtksourcelanguagemanager.h"
-#include "gtksourcestyleschememanager.h"
+#include "gtk-source-language-manager.h"
+#include "gtk-source-style-scheme-manager.h"
 
 #ifdef G_OS_WIN32
 #define WIN32_LEAN_AND_MEAN
diff --git a/gtksourceview/gtksourceinit.h b/gtksourceview/gtk-source-init.h
similarity index 100%
rename from gtksourceview/gtksourceinit.h
rename to gtksourceview/gtk-source-init.h
diff --git a/gtksourceview/gtksourceiter.c b/gtksourceview/gtk-source-iter.c
similarity index 99%
rename from gtksourceview/gtksourceiter.c
rename to gtksourceview/gtk-source-iter.c
index afe94ba0..60c951a9 100644
--- a/gtksourceview/gtksourceiter.c
+++ b/gtksourceview/gtk-source-iter.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourceiter.h"
+#include "gtk-source-iter.h"
 
 /* GtkTextIter functions. Contains forward/backward functions for word
  * movements, with custom word boundaries that are used for word selection
diff --git a/gtksourceview/gtksourceiter.h b/gtksourceview/gtk-source-iter.h
similarity index 98%
rename from gtksourceview/gtksourceiter.h
rename to gtksourceview/gtk-source-iter.h
index d4bacf00..72103531 100644
--- a/gtksourceview/gtksourceiter.h
+++ b/gtksourceview/gtk-source-iter.h
@@ -22,7 +22,7 @@
 #define GTK_SOURCE_ITER_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtk-source-language-manager.c
similarity index 99%
rename from gtksourceview/gtksourcelanguagemanager.c
rename to gtksourceview/gtk-source-language-manager.c
index eeba8a71..2aac84ea 100644
--- a/gtksourceview/gtksourcelanguagemanager.c
+++ b/gtksourceview/gtk-source-language-manager.c
@@ -22,14 +22,14 @@
 #include <config.h>
 #endif
 
-#include "gtksourcelanguagemanager.h"
+#include "gtk-source-language-manager.h"
 
 #include <string.h>
 #include <gio/gio.h>
 
-#include "gtksourcelanguage.h"
-#include "gtksourcelanguage-private.h"
-#include "gtksourceutils-private.h"
+#include "gtk-source-language.h"
+#include "gtk-source-language-private.h"
+#include "gtk-source-utils-private.h"
 
 /**
  * SECTION:languagemanager
diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtk-source-language-manager.h
similarity index 98%
rename from gtksourceview/gtksourcelanguagemanager.h
rename to gtksourceview/gtk-source-language-manager.h
index 219b165a..655a1235 100644
--- a/gtksourceview/gtksourcelanguagemanager.h
+++ b/gtksourceview/gtk-source-language-manager.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcelanguage-parser-2.c b/gtksourceview/gtk-source-language-parser.c
similarity index 99%
rename from gtksourceview/gtksourcelanguage-parser-2.c
rename to gtksourceview/gtk-source-language-parser.c
index 8b61ec04..b2df139a 100644
--- a/gtksourceview/gtksourcelanguage-parser-2.c
+++ b/gtksourceview/gtk-source-language-parser.c
@@ -32,10 +32,10 @@
 #include <config.h>
 #endif
 
-#include "gtksourcebuffer.h"
-#include "gtksourcelanguage.h"
-#include "gtksourcelanguage-private.h"
-#include "gtksourcecontextengine.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-language.h"
+#include "gtk-source-language-private.h"
+#include "gtk-source-context-engine.h"
 
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/gtksourceview/gtksourcelanguage-private.h b/gtksourceview/gtk-source-language-private.h
similarity index 97%
rename from gtksourceview/gtksourcelanguage-private.h
rename to gtksourceview/gtk-source-language-private.h
index 80bf7eac..bdd2d8a7 100644
--- a/gtksourceview/gtksourcelanguage-private.h
+++ b/gtksourceview/gtk-source-language-private.h
@@ -22,8 +22,8 @@
 #define GTK_SOURCE_LANGUAGE_PRIVATE_H
 
 #include <glib.h>
-#include "gtksourcecontextengine.h"
-#include "gtksourcelanguagemanager.h"
+#include "gtk-source-context-engine.h"
+#include "gtk-source-language-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcelanguage.c b/gtksourceview/gtk-source-language.c
similarity index 99%
rename from gtksourceview/gtksourcelanguage.c
rename to gtksourceview/gtk-source-language.c
index 43105459..0fb41dbb 100644
--- a/gtksourceview/gtksourcelanguage.c
+++ b/gtksourceview/gtk-source-language.c
@@ -32,9 +32,9 @@
 #include <libxml/xmlreader.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
-#include "gtksourcelanguage-private.h"
-#include "gtksourcelanguage.h"
-#include "gtksourceutils-private.h"
+#include "gtk-source-language-private.h"
+#include "gtk-source-language.h"
+#include "gtk-source-utils-private.h"
 
 #ifdef G_OS_WIN32
 #include <io.h>
diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtk-source-language.h
similarity index 98%
rename from gtksourceview/gtksourcelanguage.h
rename to gtksourceview/gtk-source-language.h
index c27c9b4d..a43aa38d 100644
--- a/gtksourceview/gtksourcelanguage.h
+++ b/gtksourceview/gtk-source-language.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcemap.c b/gtksourceview/gtk-source-map.c
similarity index 99%
rename from gtksourceview/gtksourcemap.c
rename to gtksourceview/gtk-source-map.c
index 35362c39..56006762 100644
--- a/gtksourceview/gtksourcemap.c
+++ b/gtksourceview/gtk-source-map.c
@@ -21,13 +21,13 @@
 #include <config.h>
 #endif
 
-#include "gtksourcemap.h"
+#include "gtk-source-map.h"
 #include <string.h>
-#include "gtksourcebuffer.h"
-#include "gtksourcecompletion.h"
-#include "gtksourcestyle-private.h"
-#include "gtksourcestylescheme.h"
-#include "gtksourceutils-private.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-completion.h"
+#include "gtk-source-style-private.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-utils-private.h"
 
 /**
  * SECTION:map
diff --git a/gtksourceview/gtksourcemap.h b/gtksourceview/gtk-source-map.h
similarity index 96%
rename from gtksourceview/gtksourcemap.h
rename to gtksourceview/gtk-source-map.h
index 99cd9608..7dcad1b3 100644
--- a/gtksourceview/gtksourcemap.h
+++ b/gtksourceview/gtk-source-map.h
@@ -25,8 +25,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtk-source-types.h>
+#include <gtksourceview/gtk-source-view.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcemarkattributes.c b/gtksourceview/gtk-source-mark-attributes.c
similarity index 99%
rename from gtksourceview/gtksourcemarkattributes.c
rename to gtksourceview/gtk-source-mark-attributes.c
index 8f96d9e3..e12b43fa 100644
--- a/gtksourceview/gtksourcemarkattributes.c
+++ b/gtksourceview/gtk-source-mark-attributes.c
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 
-#include "gtksourcemarkattributes.h"
-#include "gtksourcemark.h"
+#include "gtk-source-mark-attributes.h"
+#include "gtk-source-mark.h"
 #include "gtksource-marshal.h"
-#include "gtksourcepixbufhelper.h"
+#include "gtk-source-pixbuf-helper.h"
 
 /**
  * SECTION:markattributes
diff --git a/gtksourceview/gtksourcemarkattributes.h b/gtksourceview/gtk-source-mark-attributes.h
similarity index 99%
rename from gtksourceview/gtksourcemarkattributes.h
rename to gtksourceview/gtk-source-mark-attributes.h
index 86891309..abaa9572 100644
--- a/gtksourceview/gtksourcemarkattributes.h
+++ b/gtksourceview/gtk-source-mark-attributes.h
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcemark.c b/gtksourceview/gtk-source-mark.c
similarity index 98%
rename from gtksourceview/gtksourcemark.c
rename to gtksourceview/gtk-source-mark.c
index 447f03d1..124d5bb4 100644
--- a/gtksourceview/gtksourcemark.c
+++ b/gtksourceview/gtk-source-mark.c
@@ -22,9 +22,9 @@
 #include <config.h>
 #endif
 
-#include "gtksourcemark.h"
-#include "gtksourcebuffer.h"
-#include "gtksourcebuffer-private.h"
+#include "gtk-source-mark.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-buffer-private.h"
 
 /**
  * SECTION:mark
diff --git a/gtksourceview/gtksourcemark.h b/gtksourceview/gtk-source-mark.h
similarity index 98%
rename from gtksourceview/gtksourcemark.h
rename to gtksourceview/gtk-source-mark.h
index 60608e63..dc866032 100644
--- a/gtksourceview/gtksourcemark.h
+++ b/gtksourceview/gtk-source-mark.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcemarkssequence.c b/gtksourceview/gtk-source-marks-sequence.c
similarity index 99%
rename from gtksourceview/gtksourcemarkssequence.c
rename to gtksourceview/gtk-source-marks-sequence.c
index 9678efdc..151c0da2 100644
--- a/gtksourceview/gtksourcemarkssequence.c
+++ b/gtksourceview/gtk-source-marks-sequence.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourcemarkssequence.h"
+#include "gtk-source-marks-sequence.h"
 
 /* An object for storing GtkTextMarks. The text marks are sorted internally with
  * a GSequence. Going to the previous or next text mark has a O(1) complexity.
diff --git a/gtksourceview/gtksourcemarkssequence.h b/gtksourceview/gtk-source-marks-sequence.h
similarity index 98%
rename from gtksourceview/gtksourcemarkssequence.h
rename to gtksourceview/gtk-source-marks-sequence.h
index 57293e63..82cfc98d 100644
--- a/gtksourceview/gtksourcemarkssequence.h
+++ b/gtksourceview/gtk-source-marks-sequence.h
@@ -22,7 +22,7 @@
 #define GTK_SOURCE_MARKS_SEQUENCE_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcepixbufhelper.c b/gtksourceview/gtk-source-pixbuf-helper.c
similarity index 99%
rename from gtksourceview/gtksourcepixbufhelper.c
rename to gtksourceview/gtk-source-pixbuf-helper.c
index 59ad24df..908bec95 100644
--- a/gtksourceview/gtksourcepixbufhelper.c
+++ b/gtksourceview/gtk-source-pixbuf-helper.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourcepixbufhelper.h"
+#include "gtk-source-pixbuf-helper.h"
 
 typedef enum _IconType
 {
diff --git a/gtksourceview/gtksourcepixbufhelper.h b/gtksourceview/gtk-source-pixbuf-helper.h
similarity index 98%
rename from gtksourceview/gtksourcepixbufhelper.h
rename to gtksourceview/gtk-source-pixbuf-helper.h
index d37338bd..a65d6e42 100644
--- a/gtksourceview/gtksourcepixbufhelper.h
+++ b/gtksourceview/gtk-source-pixbuf-helper.h
@@ -22,7 +22,7 @@
 #define GTK_SOURCE_PIXBUF_HELPER_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types-private.h"
 
 G_GNUC_INTERNAL
 GtkSourcePixbufHelper *gtk_source_pixbuf_helper_new (void);
diff --git a/gtksourceview/gtksourceprintcompositor.c b/gtksourceview/gtk-source-print-compositor.c
similarity index 99%
rename from gtksourceview/gtksourceprintcompositor.c
rename to gtksourceview/gtk-source-print-compositor.c
index c2ec3f60..7a04a35d 100644
--- a/gtksourceview/gtksourceprintcompositor.c
+++ b/gtksourceview/gtk-source-print-compositor.c
@@ -29,10 +29,10 @@
 #include <string.h>
 #include <time.h>
 
-#include "gtksourceprintcompositor.h"
-#include "gtksourceview.h"
-#include "gtksourcebuffer.h"
-#include "gtksourcebuffer-private.h"
+#include "gtk-source-print-compositor.h"
+#include "gtk-source-view.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-buffer-private.h"
 
 /**
  * SECTION:printcompositor
diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtk-source-print-compositor.h
similarity index 99%
rename from gtksourceview/gtksourceprintcompositor.h
rename to gtksourceview/gtk-source-print-compositor.h
index f29db3cd..d3141f9e 100644
--- a/gtksourceview/gtksourceprintcompositor.h
+++ b/gtksourceview/gtk-source-print-compositor.h
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceregex.c b/gtksourceview/gtk-source-regex.c
similarity index 99%
rename from gtksourceview/gtksourceregex.c
rename to gtksourceview/gtk-source-regex.c
index 77570837..a7c68697 100644
--- a/gtksourceview/gtksourceregex.c
+++ b/gtksourceview/gtk-source-regex.c
@@ -23,11 +23,11 @@
 #include <config.h>
 #endif
 
-#include "gtksourceregex.h"
+#include "gtk-source-regex.h"
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n-lib.h>
-#include "gtksourceutils-private.h"
+#include "gtk-source-utils-private.h"
 
 /*
  * GRegex wrapper which adds a few features needed for syntax highlighting,
diff --git a/gtksourceview/gtksourceregex.h b/gtksourceview/gtk-source-regex.h
similarity index 98%
rename from gtksourceview/gtksourceregex.h
rename to gtksourceview/gtk-source-regex.h
index edf9d6b7..40ef3633 100644
--- a/gtksourceview/gtksourceregex.h
+++ b/gtksourceview/gtk-source-regex.h
@@ -23,7 +23,7 @@
 #define GTK_SOURCE_REGEX_H
 
 #include <glib.h>
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceregion.c b/gtksourceview/gtk-source-region.c
similarity index 99%
rename from gtksourceview/gtksourceregion.c
rename to gtksourceview/gtk-source-region.c
index c8b58244..94ad1d34 100644
--- a/gtksourceview/gtksourceregion.c
+++ b/gtksourceview/gtk-source-region.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- * gtksourceregion.c - GtkTextMark-based region utility
+ * gtk-source-region.c - GtkTextMark-based region utility
  * This file is part of GtkSourceView
  *
  * Copyright (C) 2002 Gustavo Giráldez <gustavo giraldez gmx net>
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourceregion.h"
+#include "gtk-source-region.h"
 
 /**
  * SECTION:region
diff --git a/gtksourceview/gtksourceregion.h b/gtksourceview/gtk-source-region.h
similarity index 98%
rename from gtksourceview/gtksourceregion.h
rename to gtksourceview/gtk-source-region.h
index ad9a80f4..35bf9e28 100644
--- a/gtksourceview/gtksourceregion.h
+++ b/gtksourceview/gtk-source-region.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- * gtksourceregion.h - GtkTextMark-based region utility
+ * gtk-source-region.h - GtkTextMark-based region utility
  * This file is part of GtkSourceView
  *
  * Copyright (C) 2002 Gustavo Giráldez <gustavo giraldez gmx net>
diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtk-source-search-context.c
similarity index 99%
rename from gtksourceview/gtksourcesearchcontext.c
rename to gtksourceview/gtk-source-search-context.c
index 90811670..4435233b 100644
--- a/gtksourceview/gtksourcesearchcontext.c
+++ b/gtksourceview/gtk-source-search-context.c
@@ -22,17 +22,17 @@
 #include <config.h>
 #endif
 
-#include "gtksourcesearchcontext.h"
+#include "gtk-source-search-context.h"
 #include <string.h>
-#include "gtksourcesearchsettings.h"
-#include "gtksourcebuffer.h"
-#include "gtksourcebuffer-private.h"
-#include "gtksourcebufferinternal.h"
-#include "gtksourcestyle.h"
-#include "gtksourcestylescheme.h"
-#include "gtksourceutils.h"
-#include "gtksourceregion.h"
-#include "gtksourceiter.h"
+#include "gtk-source-search-settings.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-buffer-private.h"
+#include "gtk-source-buffer-internal.h"
+#include "gtk-source-style.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-utils.h"
+#include "gtk-source-region.h"
+#include "gtk-source-iter.h"
 #include "gtksource-enumtypes.h"
 
 /**
diff --git a/gtksourceview/gtksourcesearchcontext.h b/gtksourceview/gtk-source-search-context.h
similarity index 99%
rename from gtksourceview/gtksourcesearchcontext.h
rename to gtksourceview/gtk-source-search-context.h
index fd489036..d4dd2300 100644
--- a/gtksourceview/gtksourcesearchcontext.h
+++ b/gtksourceview/gtk-source-search-context.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcesearchsettings.c b/gtksourceview/gtk-source-search-settings.c
similarity index 99%
rename from gtksourceview/gtksourcesearchsettings.c
rename to gtksourceview/gtk-source-search-settings.c
index 07699f58..691cd8aa 100644
--- a/gtksourceview/gtksourcesearchsettings.c
+++ b/gtksourceview/gtk-source-search-settings.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourcesearchsettings.h"
+#include "gtk-source-search-settings.h"
 
 /**
  * SECTION:searchsettings
diff --git a/gtksourceview/gtksourcesearchsettings.h b/gtksourceview/gtk-source-search-settings.h
similarity index 98%
rename from gtksourceview/gtksourcesearchsettings.h
rename to gtksourceview/gtk-source-search-settings.h
index b6140c02..a86a9ed9 100644
--- a/gtksourceview/gtksourcesearchsettings.h
+++ b/gtksourceview/gtk-source-search-settings.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcespacedrawer-private.h b/gtksourceview/gtk-source-space-drawer-private.h
similarity index 95%
rename from gtksourceview/gtksourcespacedrawer-private.h
rename to gtksourceview/gtk-source-space-drawer-private.h
index 3b6060fa..494b6ec8 100644
--- a/gtksourceview/gtksourcespacedrawer-private.h
+++ b/gtksourceview/gtk-source-space-drawer-private.h
@@ -22,8 +22,8 @@
 #define GTK_SOURCE_SPACE_DRAWER_PRIVATE_H
 
 #include <gtk/gtk.h>
-#include "gtksourcetypes.h"
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcespacedrawer.c b/gtksourceview/gtk-source-space-drawer.c
similarity index 99%
rename from gtksourceview/gtksourcespacedrawer.c
rename to gtksourceview/gtk-source-space-drawer.c
index 62c87c4d..3b2c4ec5 100644
--- a/gtksourceview/gtksourcespacedrawer.c
+++ b/gtksourceview/gtk-source-space-drawer.c
@@ -27,13 +27,13 @@
 #include <config.h>
 #endif
 
-#include "gtksourcespacedrawer.h"
-#include "gtksourcespacedrawer-private.h"
-#include "gtksourcebuffer.h"
-#include "gtksourceiter.h"
-#include "gtksourcestylescheme.h"
-#include "gtksourcetag.h"
-#include "gtksourceview.h"
+#include "gtk-source-space-drawer.h"
+#include "gtk-source-space-drawer-private.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-iter.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-tag.h"
+#include "gtk-source-view.h"
 
 /**
  * SECTION:spacedrawer
@@ -1321,7 +1321,7 @@ _gtk_source_space_drawer_draw (GtkSourceSpaceDrawer *drawer,
 #ifdef ENABLE_PROFILE
        g_timer_stop (timer);
 
-       /* Same indentation as similar features in gtksourceview.c. */
+       /* Same indentation as similar features in gtk-source-view.c. */
        g_print ("    %s time: %g (sec * 1000)\n",
                 G_STRFUNC,
                 g_timer_elapsed (timer, NULL) * 1000);
diff --git a/gtksourceview/gtksourcespacedrawer.h b/gtksourceview/gtk-source-space-drawer.h
similarity index 99%
rename from gtksourceview/gtksourcespacedrawer.h
rename to gtksourceview/gtk-source-space-drawer.h
index b06f5d2d..7f083538 100644
--- a/gtksourceview/gtksourcespacedrawer.h
+++ b/gtksourceview/gtk-source-space-drawer.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyle-private.h b/gtksourceview/gtk-source-style-private.h
similarity index 100%
rename from gtksourceview/gtksourcestyle-private.h
rename to gtksourceview/gtk-source-style-private.h
diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.c 
b/gtksourceview/gtk-source-style-scheme-chooser-button.c
similarity index 98%
rename from gtksourceview/gtksourcestyleschemechooserbutton.c
rename to gtksourceview/gtk-source-style-scheme-chooser-button.c
index 009cea36..c66968a1 100644
--- a/gtksourceview/gtksourcestyleschemechooserbutton.c
+++ b/gtksourceview/gtk-source-style-scheme-chooser-button.c
@@ -23,11 +23,11 @@
 #include <config.h>
 #endif
 
-#include "gtksourcestyleschemechooserbutton.h"
+#include "gtk-source-style-scheme-chooser-button.h"
 #include <glib/gi18n-lib.h>
-#include "gtksourcestyleschemechooser.h"
-#include "gtksourcestyleschemechooserwidget.h"
-#include "gtksourcestylescheme.h"
+#include "gtk-source-style-scheme-chooser.h"
+#include "gtk-source-style-scheme-chooser-widget.h"
+#include "gtk-source-style-scheme.h"
 
 /**
  * SECTION:styleschemechooserbutton
diff --git a/gtksourceview/gtksourcestyleschemechooserbutton.h 
b/gtksourceview/gtk-source-style-scheme-chooser-button.h
similarity index 98%
rename from gtksourceview/gtksourcestyleschemechooserbutton.h
rename to gtksourceview/gtk-source-style-scheme-chooser-button.h
index 06fe648a..8e9d8392 100644
--- a/gtksourceview/gtksourcestyleschemechooserbutton.h
+++ b/gtksourceview/gtk-source-style-scheme-chooser-button.h
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.c 
b/gtksourceview/gtk-source-style-scheme-chooser-widget.c
similarity index 97%
rename from gtksourceview/gtksourcestyleschemechooserwidget.c
rename to gtksourceview/gtk-source-style-scheme-chooser-widget.c
index f3e13c66..b316ed55 100644
--- a/gtksourceview/gtksourcestyleschemechooserwidget.c
+++ b/gtksourceview/gtk-source-style-scheme-chooser-widget.c
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include "gtksourcestyleschemechooserwidget.h"
-#include "gtksourcestyleschemechooser.h"
-#include "gtksourcestylescheme.h"
-#include "gtksourcestyleschememanager.h"
-#include "gtksourcelanguage.h"
-#include "gtksourcelanguagemanager.h"
-#include "gtksourcebuffer.h"
-#include "gtksourceview.h"
+#include "gtk-source-style-scheme-chooser-widget.h"
+#include "gtk-source-style-scheme-chooser.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-style-scheme-manager.h"
+#include "gtk-source-language.h"
+#include "gtk-source-language-manager.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-view.h"
 
 /**
  * SECTION:styleschemechooserwidget
diff --git a/gtksourceview/gtksourcestyleschemechooserwidget.h 
b/gtksourceview/gtk-source-style-scheme-chooser-widget.h
similarity index 98%
rename from gtksourceview/gtksourcestyleschemechooserwidget.h
rename to gtksourceview/gtk-source-style-scheme-chooser-widget.h
index 3e4242bd..4dea0777 100644
--- a/gtksourceview/gtksourcestyleschemechooserwidget.h
+++ b/gtksourceview/gtk-source-style-scheme-chooser-widget.h
@@ -27,7 +27,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyleschemechooser.c b/gtksourceview/gtk-source-style-scheme-chooser.c
similarity index 97%
rename from gtksourceview/gtksourcestyleschemechooser.c
rename to gtksourceview/gtk-source-style-scheme-chooser.c
index ce85d6c9..16a4437b 100644
--- a/gtksourceview/gtksourcestyleschemechooser.c
+++ b/gtksourceview/gtk-source-style-scheme-chooser.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include "gtksourcestyleschemechooser.h"
-#include "gtksourcestylescheme.h"
+#include "gtk-source-style-scheme-chooser.h"
+#include "gtk-source-style-scheme.h"
 
 /**
  * SECTION:styleschemechooser
diff --git a/gtksourceview/gtksourcestyleschemechooser.h b/gtksourceview/gtk-source-style-scheme-chooser.h
similarity index 98%
rename from gtksourceview/gtksourcestyleschemechooser.h
rename to gtksourceview/gtk-source-style-scheme-chooser.h
index c32d4175..5f2f4d3e 100644
--- a/gtksourceview/gtksourcestyleschemechooser.h
+++ b/gtksourceview/gtk-source-style-scheme-chooser.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtk-source-style-scheme-manager.c
similarity index 99%
rename from gtksourceview/gtksourcestyleschememanager.c
rename to gtksourceview/gtk-source-style-scheme-manager.c
index c56d09bc..84f20fbe 100644
--- a/gtksourceview/gtksourcestyleschememanager.c
+++ b/gtksourceview/gtk-source-style-scheme-manager.c
@@ -22,10 +22,10 @@
 #include <config.h>
 #endif
 
-#include "gtksourcestyleschememanager.h"
+#include "gtk-source-style-scheme-manager.h"
 #include <string.h>
-#include "gtksourcestylescheme.h"
-#include "gtksourceutils-private.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-utils-private.h"
 
 /**
  * SECTION:styleschememanager
diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtk-source-style-scheme-manager.h
similarity index 98%
rename from gtksourceview/gtksourcestyleschememanager.h
rename to gtksourceview/gtk-source-style-scheme-manager.h
index c7795b4e..df582676 100644
--- a/gtksourceview/gtksourcestyleschememanager.h
+++ b/gtksourceview/gtk-source-style-scheme-manager.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtk-source-style-scheme.c
similarity index 99%
rename from gtksourceview/gtksourcestylescheme.c
rename to gtksourceview/gtk-source-style-scheme.c
index 5538ae3b..63bed74d 100644
--- a/gtksourceview/gtksourcestylescheme.c
+++ b/gtksourceview/gtk-source-style-scheme.c
@@ -22,15 +22,15 @@
 #include <config.h>
 #endif
 
-#include "gtksourcestylescheme.h"
+#include "gtk-source-style-scheme.h"
 #include <libxml/parser.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include "gtksourcestyleschememanager.h"
-#include "gtksourcestyle.h"
-#include "gtksourcestyle-private.h"
-#include "gtksourceview.h"
-#include "gtksourcelanguage-private.h"
+#include "gtk-source-style-scheme-manager.h"
+#include "gtk-source-style.h"
+#include "gtk-source-style-private.h"
+#include "gtk-source-view.h"
+#include "gtk-source-language-private.h"
 
 /**
  * SECTION:stylescheme
diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtk-source-style-scheme.h
similarity index 99%
rename from gtksourceview/gtksourcestylescheme.h
rename to gtksourceview/gtk-source-style-scheme.h
index 177878c6..d94235b6 100644
--- a/gtksourceview/gtksourcestylescheme.h
+++ b/gtksourceview/gtk-source-style-scheme.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcestyle.c b/gtksourceview/gtk-source-style.c
similarity index 99%
rename from gtksourceview/gtksourcestyle.c
rename to gtksourceview/gtk-source-style.c
index 70fe8445..e84fbe7d 100644
--- a/gtksourceview/gtksourcestyle.c
+++ b/gtksourceview/gtk-source-style.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include "gtksourcestyle.h"
-#include "gtksourcestyle-private.h"
+#include "gtk-source-style.h"
+#include "gtk-source-style-private.h"
 
 /**
  * SECTION:style
diff --git a/gtksourceview/gtksourcestyle.h b/gtksourceview/gtk-source-style.h
similarity index 98%
rename from gtksourceview/gtksourcestyle.h
rename to gtksourceview/gtk-source-style.h
index b60d2e6d..fcdc31af 100644
--- a/gtksourceview/gtksourcestyle.h
+++ b/gtksourceview/gtk-source-style.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcetag.c b/gtksourceview/gtk-source-tag.c
similarity index 99%
rename from gtksourceview/gtksourcetag.c
rename to gtksourceview/gtk-source-tag.c
index 22e6ddee..7ea69c81 100644
--- a/gtksourceview/gtksourcetag.c
+++ b/gtksourceview/gtk-source-tag.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourcetag.h"
+#include "gtk-source-tag.h"
 
 /**
  * SECTION:tag
diff --git a/gtksourceview/gtksourcetag.h b/gtksourceview/gtk-source-tag.h
similarity index 97%
rename from gtksourceview/gtksourcetag.h
rename to gtksourceview/gtk-source-tag.h
index 73857682..4690a785 100644
--- a/gtksourceview/gtksourcetag.h
+++ b/gtksourceview/gtk-source-tag.h
@@ -28,7 +28,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourcetypes-private.h b/gtksourceview/gtk-source-types-private.h
similarity index 100%
rename from gtksourceview/gtksourcetypes-private.h
rename to gtksourceview/gtk-source-types-private.h
diff --git a/gtksourceview/gtksourcetypes.h b/gtksourceview/gtk-source-types.h
similarity index 100%
rename from gtksourceview/gtksourcetypes.h
rename to gtksourceview/gtk-source-types.h
diff --git a/gtksourceview/gtksourceundomanagerdefault.c b/gtksourceview/gtk-source-undo-manager-default.c
similarity index 99%
rename from gtksourceview/gtksourceundomanagerdefault.c
rename to gtksourceview/gtk-source-undo-manager-default.c
index d7e33d44..ac31375f 100644
--- a/gtksourceview/gtksourceundomanagerdefault.c
+++ b/gtksourceview/gtk-source-undo-manager-default.c
@@ -25,9 +25,9 @@
 #include <config.h>
 #endif
 
-#include "gtksourceundomanagerdefault.h"
+#include "gtk-source-undo-manager-default.h"
 #include <string.h>
-#include "gtksourceundomanager.h"
+#include "gtk-source-undo-manager.h"
 
 /* unlimited by default */
 #define DEFAULT_MAX_UNDO_LEVELS -1
diff --git a/gtksourceview/gtksourceundomanagerdefault.h b/gtksourceview/gtk-source-undo-manager-default.h
similarity index 98%
rename from gtksourceview/gtksourceundomanagerdefault.h
rename to gtksourceview/gtk-source-undo-manager-default.h
index 6010bf2b..4ef27d94 100644
--- a/gtksourceview/gtksourceundomanagerdefault.h
+++ b/gtksourceview/gtk-source-undo-manager-default.h
@@ -24,7 +24,7 @@
 #define GTK_SOURCE_UNDO_MANAGER_DEFAULT_H
 
 #include <glib-object.h>
-#include "gtksourcetypes-private.h"
+#include "gtk-source-types-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceundomanager.c b/gtksourceview/gtk-source-undo-manager.c
similarity index 99%
rename from gtksourceview/gtksourceundomanager.c
rename to gtksourceview/gtk-source-undo-manager.c
index de00b97b..01aa826b 100644
--- a/gtksourceview/gtksourceundomanager.c
+++ b/gtksourceview/gtk-source-undo-manager.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gtksourceundomanager.h"
+#include "gtk-source-undo-manager.h"
 
 /**
  * SECTION:undomanager
diff --git a/gtksourceview/gtksourceundomanager.h b/gtksourceview/gtk-source-undo-manager.h
similarity index 98%
rename from gtksourceview/gtksourceundomanager.h
rename to gtksourceview/gtk-source-undo-manager.h
index d7ae23f7..47c10715 100644
--- a/gtksourceview/gtksourceundomanager.h
+++ b/gtksourceview/gtk-source-undo-manager.h
@@ -28,7 +28,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceutils-private.h b/gtksourceview/gtk-source-utils-private.h
similarity index 100%
rename from gtksourceview/gtksourceutils-private.h
rename to gtksourceview/gtk-source-utils-private.h
diff --git a/gtksourceview/gtksourceutils.c b/gtksourceview/gtk-source-utils.c
similarity index 99%
rename from gtksourceview/gtksourceutils.c
rename to gtksourceview/gtk-source-utils.c
index 9095aae5..10b79879 100644
--- a/gtksourceview/gtksourceutils.c
+++ b/gtksourceview/gtk-source-utils.c
@@ -33,8 +33,8 @@
 #include <config.h>
 #endif
 
-#include "gtksourceutils.h"
-#include "gtksourceutils-private.h"
+#include "gtk-source-utils.h"
+#include "gtk-source-utils-private.h"
 #include <string.h>
 #include <errno.h>
 #include <math.h>
diff --git a/gtksourceview/gtksourceutils.h b/gtksourceview/gtk-source-utils.h
similarity index 100%
rename from gtksourceview/gtksourceutils.h
rename to gtksourceview/gtk-source-utils.h
diff --git a/gtksourceview/gtksourceversion.c b/gtksourceview/gtk-source-version.c
similarity index 100%
rename from gtksourceview/gtksourceversion.c
rename to gtksourceview/gtk-source-version.c
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtk-source-view.c
similarity index 99%
rename from gtksourceview/gtksourceview.c
rename to gtksourceview/gtk-source-view.c
index 60c2701c..5978cc28 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtk-source-view.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include "gtksourceview.h"
+#include "gtk-source-view.h"
 
 #include <string.h> /* For strlen */
 #include <fribidi.h>
@@ -34,25 +34,25 @@
 #include <pango/pango-tabs.h>
 #include <glib/gi18n-lib.h>
 
-#include "gtksourcebuffer.h"
-#include "gtksourcebuffer-private.h"
-#include "gtksourcebufferinternal.h"
+#include "gtk-source-buffer.h"
+#include "gtk-source-buffer-private.h"
+#include "gtk-source-buffer-internal.h"
 #include "gtksource-enumtypes.h"
-#include "gtksourcemark.h"
-#include "gtksourcemarkattributes.h"
+#include "gtk-source-mark.h"
+#include "gtk-source-mark-attributes.h"
 #include "gtksource-marshal.h"
-#include "gtksourcestylescheme.h"
-#include "gtksourcecompletion.h"
-#include "gtksourcecompletion-private.h"
-#include "gtksourcecompletionprovider.h"
-#include "gtksourcegutter.h"
-#include "gtksourcegutter-private.h"
-#include "gtksourcegutterrendererlines.h"
-#include "gtksourcegutterrenderermarks.h"
-#include "gtksourceiter.h"
-#include "gtksourcesearchcontext.h"
-#include "gtksourcespacedrawer.h"
-#include "gtksourcespacedrawer-private.h"
+#include "gtk-source-style-scheme.h"
+#include "gtk-source-completion.h"
+#include "gtk-source-completion-private.h"
+#include "gtk-source-completion-provider.h"
+#include "gtk-source-gutter.h"
+#include "gtk-source-gutter-private.h"
+#include "gtk-source-gutter-renderer-lines.h"
+#include "gtk-source-gutter-renderer-marks.h"
+#include "gtk-source-iter.h"
+#include "gtk-source-search-context.h"
+#include "gtk-source-space-drawer.h"
+#include "gtk-source-space-drawer-private.h"
 
 /**
  * SECTION:view
diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtk-source-view.h
similarity index 99%
rename from gtksourceview/gtksourceview.h
rename to gtksourceview/gtk-source-view.h
index 8e8031f9..74772598 100644
--- a/gtksourceview/gtksourceview.h
+++ b/gtksourceview/gtk-source-view.h
@@ -28,7 +28,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksource.h b/gtksourceview/gtksource.h
index e1ae114b..dad2ed65 100644
--- a/gtksourceview/gtksource.h
+++ b/gtksourceview/gtksource.h
@@ -21,44 +21,44 @@
 #define GTK_SOURCE_H_INSIDE
 
 #include <gtksourceview/completion-providers/words/gtksourcecompletionwords.h>
-#include <gtksourceview/gtksourcetypes.h>
-#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourcecompletioncontext.h>
-#include <gtksourceview/gtksourcecompletion.h>
-#include <gtksourceview/gtksourcecompletioninfo.h>
-#include <gtksourceview/gtksourcecompletionitem.h>
-#include <gtksourceview/gtksourcecompletionproposal.h>
-#include <gtksourceview/gtksourcecompletionprovider.h>
-#include <gtksourceview/gtksourceencoding.h>
-#include <gtksourceview/gtksourcefile.h>
-#include <gtksourceview/gtksourcefileloader.h>
-#include <gtksourceview/gtksourcefilesaver.h>
-#include <gtksourceview/gtksourcegutter.h>
-#include <gtksourceview/gtksourcegutterrenderer.h>
-#include <gtksourceview/gtksourcegutterrenderertext.h>
-#include <gtksourceview/gtksourcegutterrendererpixbuf.h>
-#include <gtksourceview/gtksourceinit.h>
-#include <gtksourceview/gtksourcelanguage.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-#include <gtksourceview/gtksourcemap.h>
-#include <gtksourceview/gtksourcemark.h>
-#include <gtksourceview/gtksourcemarkattributes.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
-#include <gtksourceview/gtksourceregion.h>
-#include <gtksourceview/gtksourcesearchcontext.h>
-#include <gtksourceview/gtksourcesearchsettings.h>
-#include <gtksourceview/gtksourcespacedrawer.h>
-#include <gtksourceview/gtksourcestyle.h>
-#include <gtksourceview/gtksourcestylescheme.h>
-#include <gtksourceview/gtksourcestyleschemechooser.h>
-#include <gtksourceview/gtksourcestyleschemechooserbutton.h>
-#include <gtksourceview/gtksourcestyleschemechooserwidget.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
-#include <gtksourceview/gtksourcetag.h>
-#include <gtksourceview/gtksourceundomanager.h>
-#include <gtksourceview/gtksourceutils.h>
+#include <gtksourceview/gtk-source-types.h>
+#include <gtksourceview/gtk-source-buffer.h>
+#include <gtksourceview/gtk-source-completion-context.h>
+#include <gtksourceview/gtk-source-completion.h>
+#include <gtksourceview/gtk-source-completion-info.h>
+#include <gtksourceview/gtk-source-completion-item.h>
+#include <gtksourceview/gtk-source-completion-proposal.h>
+#include <gtksourceview/gtk-source-completion-provider.h>
+#include <gtksourceview/gtk-source-encoding.h>
+#include <gtksourceview/gtk-source-file.h>
+#include <gtksourceview/gtk-source-file-loader.h>
+#include <gtksourceview/gtk-source-file-saver.h>
+#include <gtksourceview/gtk-source-gutter.h>
+#include <gtksourceview/gtk-source-gutter-renderer.h>
+#include <gtksourceview/gtk-source-gutter-renderer-text.h>
+#include <gtksourceview/gtk-source-gutter-renderer-pixbuf.h>
+#include <gtksourceview/gtk-source-init.h>
+#include <gtksourceview/gtk-source-language.h>
+#include <gtksourceview/gtk-source-language-manager.h>
+#include <gtksourceview/gtk-source-map.h>
+#include <gtksourceview/gtk-source-mark.h>
+#include <gtksourceview/gtk-source-mark-attributes.h>
+#include <gtksourceview/gtk-source-print-compositor.h>
+#include <gtksourceview/gtk-source-region.h>
+#include <gtksourceview/gtk-source-search-context.h>
+#include <gtksourceview/gtk-source-search-settings.h>
+#include <gtksourceview/gtk-source-space-drawer.h>
+#include <gtksourceview/gtk-source-style.h>
+#include <gtksourceview/gtk-source-style-scheme.h>
+#include <gtksourceview/gtk-source-style-scheme-chooser.h>
+#include <gtksourceview/gtk-source-style-scheme-chooser-button.h>
+#include <gtksourceview/gtk-source-style-scheme-chooser-widget.h>
+#include <gtksourceview/gtk-source-style-scheme-manager.h>
+#include <gtksourceview/gtk-source-tag.h>
+#include <gtksourceview/gtk-source-undo-manager.h>
+#include <gtksourceview/gtk-source-utils.h>
+#include <gtksourceview/gtk-source-view.h>
 #include <gtksourceview/gtksourceversion.h>
-#include <gtksourceview/gtksourceview.h>
 #include <gtksourceview/gtksource-enumtypes.h>
 #include <gtksourceview/gtksourceautocleanups.h>
 
diff --git a/gtksourceview/gtksourceautocleanups.h b/gtksourceview/gtksourceautocleanups.h
index 9929368a..f18b2e9e 100644
--- a/gtksourceview/gtksourceautocleanups.h
+++ b/gtksourceview/gtksourceautocleanups.h
@@ -23,7 +23,7 @@
 #endif
 
 #include <glib.h>
-#include <gtksourceview/gtksourcetypes.h>
+#include <gtksourceview/gtk-source-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtksourceview/gtksourceview.gresource.xml b/gtksourceview/gtksourceview.gresource.xml
index 8c8d5f05..2e2b30de 100644
--- a/gtksourceview/gtksourceview.gresource.xml
+++ b/gtksourceview/gtksourceview.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/gtksourceview/ui">
-    <file preprocess="xml-stripblanks">gtksourcecompletion.ui</file>
+    <file preprocess="xml-stripblanks">gtk-source-completion.ui</file>
   </gresource>
 </gresources>
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index 14603ffe..6200c1c4 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -8,101 +8,101 @@ core_marshallers = gnome.genmarshal('gtksource-marshal',
 core_public_h = files([
   'gtksource.h',
   'gtksourceautocleanups.h',
-  'gtksourcebuffer.h',
-  'gtksourcecompletion.h',
-  'gtksourcecompletioncontext.h',
-  'gtksourcecompletioninfo.h',
-  'gtksourcecompletionitem.h',
-  'gtksourcecompletionproposal.h',
-  'gtksourcecompletionprovider.h',
-  'gtksourceencoding.h',
-  'gtksourcefile.h',
-  'gtksourcefileloader.h',
-  'gtksourcefilesaver.h',
-  'gtksourcegutter.h',
-  'gtksourcegutterrenderer.h',
-  'gtksourcegutterrendererpixbuf.h',
-  'gtksourcegutterrenderertext.h',
-  'gtksourceinit.h',
-  'gtksourcelanguage.h',
-  'gtksourcelanguagemanager.h',
-  'gtksourcemap.h',
-  'gtksourcemark.h',
-  'gtksourcemarkattributes.h',
-  'gtksourceprintcompositor.h',
-  'gtksourceregion.h',
-  'gtksourcesearchcontext.h',
-  'gtksourcesearchsettings.h',
-  'gtksourcespacedrawer.h',
-  'gtksourcestyle.h',
-  'gtksourcestylescheme.h',
-  'gtksourcestyleschemechooser.h',
-  'gtksourcestyleschemechooserbutton.h',
-  'gtksourcestyleschemechooserwidget.h',
-  'gtksourcestyleschememanager.h',
-  'gtksourcetag.h',
-  'gtksourcetypes.h',
-  'gtksourceundomanager.h',
-  'gtksourceutils.h',
-  'gtksourceview.h',
+  'gtk-source-buffer.h',
+  'gtk-source-completion.h',
+  'gtk-source-completion-context.h',
+  'gtk-source-completion-info.h',
+  'gtk-source-completion-item.h',
+  'gtk-source-completion-proposal.h',
+  'gtk-source-completion-provider.h',
+  'gtk-source-encoding.h',
+  'gtk-source-file.h',
+  'gtk-source-file-loader.h',
+  'gtk-source-file-saver.h',
+  'gtk-source-gutter.h',
+  'gtk-source-gutter-renderer.h',
+  'gtk-source-gutter-renderer-pixbuf.h',
+  'gtk-source-gutter-renderer-text.h',
+  'gtk-source-init.h',
+  'gtk-source-language.h',
+  'gtk-source-language-manager.h',
+  'gtk-source-map.h',
+  'gtk-source-mark.h',
+  'gtk-source-mark-attributes.h',
+  'gtk-source-print-compositor.h',
+  'gtk-source-region.h',
+  'gtk-source-search-context.h',
+  'gtk-source-search-settings.h',
+  'gtk-source-space-drawer.h',
+  'gtk-source-style.h',
+  'gtk-source-style-scheme.h',
+  'gtk-source-style-scheme-chooser.h',
+  'gtk-source-style-scheme-chooser-button.h',
+  'gtk-source-style-scheme-chooser-widget.h',
+  'gtk-source-style-scheme-manager.h',
+  'gtk-source-tag.h',
+  'gtk-source-types.h',
+  'gtk-source-undo-manager.h',
+  'gtk-source-utils.h',
+  'gtk-source-view.h',
 ])
 
 core_public_c = files([
-  'gtksourcebuffer.c',
-  'gtksourcecompletion.c',
-  'gtksourcecompletioncontext.c',
-  'gtksourcecompletioninfo.c',
-  'gtksourcecompletionitem.c',
-  'gtksourcecompletionproposal.c',
-  'gtksourcecompletionprovider.c',
-  'gtksourceencoding.c',
-  'gtksourcefile.c',
-  'gtksourcefileloader.c',
-  'gtksourcefilesaver.c',
-  'gtksourcegutter.c',
-  'gtksourcegutterrenderer.c',
-  'gtksourcegutterrendererpixbuf.c',
-  'gtksourcegutterrenderertext.c',
-  'gtksourceinit.c',
-  'gtksourcelanguage.c',
-  'gtksourcelanguagemanager.c',
-  'gtksourcemap.c',
-  'gtksourcemark.c',
-  'gtksourcemarkattributes.c',
-  'gtksourceprintcompositor.c',
-  'gtksourceregion.c',
-  'gtksourcesearchcontext.c',
-  'gtksourcesearchsettings.c',
-  'gtksourcespacedrawer.c',
-  'gtksourcestyle.c',
-  'gtksourcestylescheme.c',
-  'gtksourcestyleschemechooser.c',
-  'gtksourcestyleschemechooserbutton.c',
-  'gtksourcestyleschemechooserwidget.c',
-  'gtksourcestyleschememanager.c',
-  'gtksourcetag.c',
-  'gtksourceundomanager.c',
-  'gtksourceutils.c',
-  'gtksourceversion.c',
-  'gtksourceview.c',
+  'gtk-source-buffer.c',
+  'gtk-source-completion.c',
+  'gtk-source-completion-context.c',
+  'gtk-source-completion-info.c',
+  'gtk-source-completion-item.c',
+  'gtk-source-completion-proposal.c',
+  'gtk-source-completion-provider.c',
+  'gtk-source-encoding.c',
+  'gtk-source-file.c',
+  'gtk-source-file-loader.c',
+  'gtk-source-file-saver.c',
+  'gtk-source-gutter.c',
+  'gtk-source-gutter-renderer.c',
+  'gtk-source-gutter-renderer-pixbuf.c',
+  'gtk-source-gutter-renderer-text.c',
+  'gtk-source-init.c',
+  'gtk-source-language.c',
+  'gtk-source-language-manager.c',
+  'gtk-source-map.c',
+  'gtk-source-mark.c',
+  'gtk-source-mark-attributes.c',
+  'gtk-source-print-compositor.c',
+  'gtk-source-region.c',
+  'gtk-source-search-context.c',
+  'gtk-source-search-settings.c',
+  'gtk-source-space-drawer.c',
+  'gtk-source-style.c',
+  'gtk-source-style-scheme.c',
+  'gtk-source-style-scheme-chooser.c',
+  'gtk-source-style-scheme-chooser-button.c',
+  'gtk-source-style-scheme-chooser-widget.c',
+  'gtk-source-style-scheme-manager.c',
+  'gtk-source-tag.c',
+  'gtk-source-undo-manager.c',
+  'gtk-source-utils.c',
+  'gtk-source-version.c',
+  'gtk-source-view.c',
 ])
 
 core_private_c = files([
-  'gtksourcebufferinputstream.c',
-  'gtksourcebufferinternal.c',
-  'gtksourcebufferoutputstream.c',
-  'gtksourcecompletioncontainer.c',
-  'gtksourcecompletionmodel.c',
-  'gtksourcecontextengine.c',
-  'gtksourceengine.c',
-  'gtksourcegutterrendererlines.c',
-  'gtksourcegutterrenderermarks.c',
-  'gtksourceiter.c',
-  'gtksourcelanguage-parser-2.c',
-  'gtksourcemarkssequence.c',
-  'gtksourcepixbufhelper.c',
-  'gtksourceregex.c',
-  'gtksourceundomanagerdefault.c',
+  'gtk-source-buffer-input-stream.c',
+  'gtk-source-buffer-internal.c',
+  'gtk-source-buffer-output-stream.c',
+  'gtk-source-completion-container.c',
+  'gtk-source-completion-model.c',
+  'gtk-source-context-engine.c',
+  'gtk-source-engine.c',
+  'gtk-source-gutter-renderer-lines.c',
+  'gtk-source-gutter-renderer-marks.c',
+  'gtk-source-iter.c',
+  'gtk-source-language-parser.c',
+  'gtk-source-marks-sequence.c',
+  'gtk-source-pixbuf-helper.c',
+  'gtk-source-regex.c',
+  'gtk-source-undo-manager-default.c',
 ])
 
 core_c_args = [
diff --git a/tests/test-int2str.c b/tests/test-int2str.c
index 9dec0f44..2f0bcafc 100644
--- a/tests/test-int2str.c
+++ b/tests/test-int2str.c
@@ -19,7 +19,7 @@
  */
 
 #include <gtksourceview/gtksource.h>
-#include <gtksourceview/gtksourceutils-private.h>
+#include <gtksourceview/gtk-source-utils-private.h>
 
 gint
 main (gint   argc,
diff --git a/testsuite/test-buffer-input-stream.c b/testsuite/test-buffer-input-stream.c
index 4250df1c..712fa73b 100644
--- a/testsuite/test-buffer-input-stream.c
+++ b/testsuite/test-buffer-input-stream.c
@@ -22,7 +22,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include <gtksourceview/gtksource.h>
-#include "gtksourceview/gtksourcebufferinputstream.h"
+#include "gtksourceview/gtk-source-buffer-input-stream.h"
 
 static void
 test_consecutive_read (const gchar          *inbuf,
diff --git a/testsuite/test-buffer-output-stream.c b/testsuite/test-buffer-output-stream.c
index fecba844..4772aa63 100644
--- a/testsuite/test-buffer-output-stream.c
+++ b/testsuite/test-buffer-output-stream.c
@@ -24,7 +24,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include <gtksourceview/gtksource.h>
-#include "gtksourceview/gtksourcebufferoutputstream.h"
+#include "gtksourceview/gtk-source-buffer-output-stream.h"
 
 static void
 test_consecutive_write (const gchar          *inbuf,
diff --git a/testsuite/test-buffer.c b/testsuite/test-buffer.c
index d27c933a..6ca8cae3 100644
--- a/testsuite/test-buffer.c
+++ b/testsuite/test-buffer.c
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 #include <gtksourceview/gtksource.h>
-#include "gtksourceview/gtksourcebuffer-private.h"
+#include "gtksourceview/gtk-source-buffer-private.h"
 
 static const char *c_snippet =
        "#include <foo.h>\n"
diff --git a/testsuite/test-completion-model.c b/testsuite/test-completion-model.c
index ddad6b59..b92020c2 100644
--- a/testsuite/test-completion-model.c
+++ b/testsuite/test-completion-model.c
@@ -19,7 +19,7 @@
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksource.h>
-#include "gtksourceview/gtksourcecompletionmodel.h"
+#include "gtksourceview/gtk-source-completion-model.h"
 
 /* Basic provider.
  * The populate function is not implemented. Proposals are created
diff --git a/testsuite/test-encoding.c b/testsuite/test-encoding.c
index d2bf29c7..29465d0c 100644
--- a/testsuite/test-encoding.c
+++ b/testsuite/test-encoding.c
@@ -19,7 +19,7 @@
  */
 
 #include <gtksourceview/gtksource.h>
-#include "gtksourceview/gtksourceencoding-private.h"
+#include "gtksourceview/gtk-source-encoding-private.h"
 
 static void
 test_remove_duplicates (void)
diff --git a/testsuite/test-iter.c b/testsuite/test-iter.c
index 6491f6ec..cbe91ac1 100644
--- a/testsuite/test-iter.c
+++ b/testsuite/test-iter.c
@@ -18,7 +18,7 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gtksourceview/gtksourceiter.h"
+#include "gtksourceview/gtk-source-iter.h"
 
 static void
 check_full_word_boundaries (gboolean     forward,
diff --git a/testsuite/test-regex.c b/testsuite/test-regex.c
index c8a1cf52..281cd81f 100644
--- a/testsuite/test-regex.c
+++ b/testsuite/test-regex.c
@@ -20,7 +20,7 @@
 
 #include <gtk/gtk.h>
 #include <gtksourceview/gtksource.h>
-#include "gtksourceview/gtksourceregex.h"
+#include "gtksourceview/gtk-source-regex.h"
 
 static void
 test_slash_c_pattern (void)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]