(mangle_cxx_identifier): new

function. Class_bla::foo_bar_[px] ->
ly:class-bla::foo-bar[?!]. Changes throughout

37 files changed, 522 insertions, 482 deletions

diff --git a/ChangeLog b/ChangeLog
index 095b44e663..1e02e32a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/lily-guile.cc (mangle_cxx_identifier): new
+	function. Class_bla::foo_bar_[px] ->
+	ly:class-bla::foo-bar[?!]. Changes throughout
+
 2006-01-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* flower/include/guile-compatibility.hh (scm_from_unsigned): add scm_from_unsigned().
diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 7a0813d0d9..ddb55ab234 100644
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -1541,7 +1541,7 @@ tsMarkup =\markup {
 }
 
 {
-  \override Staff.TimeSignature #'stencil = #Text_interface::print
+  \override Staff.TimeSignature #'stencil = #ly:text-interface::print
   \override Staff.TimeSignature #'text = #tsMarkup
   \time 3/2
   c'2 \bar ":" c'4 c'4.
diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index e238793a61..fcc9fea43f 100644
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -3010,7 +3010,7 @@ measure rest with a different print function,
 
 @lilypond[fragment,verbatim]
 \override MultiMeasureRest #'stencil
-  = #Multi_measure_rest::percent
+  = #ly:multi-measure-rest::percent
 R1
 @end lilypond
 
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index c26a309bcd..d81994a308 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1149,8 +1149,8 @@ does not amount to much.  The initialization file
      (self-alignment-X . 0)
      (self-alignment-Y . 0)
      (script-priority . 100)
-     (stencil . ,Text_interface::print)
-     (direction . ,Script_interface::calc_direction)
+     (stencil . ,ly:text-interface::print)
+     (direction . ,ly:script-interface::calc-direction)
      (font-encoding . fetaNumber)
      (font-size . -5) 		; don't overlap when next to heads.
      (meta . ((class . Item)
@@ -1336,7 +1336,7 @@ of the broken tie is translated up.
 When applying this trick, the new @code{after-line-breaking} callback
 should also call the old one @code{after-line-breaking}, if there is
 one.  For example, if using this with @code{Hairpin},
-@code{Hairpin::after_line_breaking} should also be called.
+@code{ly:hairpin::after-line-breaking} should also be called.
 
 
 @item Some objects cannot be changed with @code{\override} for
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 8f03e9461d..fad434478a 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -319,7 +319,7 @@ fragment.
     (if (and (memq 'note-head-interface interfaces)
              (memq pos '(-2 -3 -5)))
         (begin
-          (ly:grob-set-property! grob 'stencil Text_interface::print)
+          (ly:grob-set-property! grob 'stencil ly:text-interface::print)
           (ly:grob-set-property! grob 'font-family 'roman)
           (ly:grob-set-property!
            grob 'text
@@ -336,7 +336,7 @@ fragment.
    \set autoBeaming = ##f
    \time 2/4
    <d f g>4
-   \once \override NoteHead #'stencil = #Note_head::brew_ez_stencil
+   \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil
    <d f g>
    \once \override NoteHead #'style = #'cross
    <d f g>
diff --git a/VERSION b/VERSION
index e2a6db2c1d..b82c8c0b58 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=30
+PATCH_LEVEL=31
 MY_PATCH_LEVEL=
 
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index a8ef53b557..1a84a5ed4d 100644
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -4,7 +4,7 @@
 
 #(set-global-staff-size 16)
 
-\version "2.6.0"
+\version "2.7.31"
 
 \header {
   title = "Romanzen"
@@ -249,7 +249,7 @@ leftb =  \transpose c cis {
     #(set-accidental-style 'piano-cautionary)
     \override PianoStaff.NoteCollision   #'merge-differently-dotted = ##t
     \set PianoStaff.connectArpeggios = ##t
-    \override PianoStaff.Arpeggio #'print-function = #Arpeggio::brew_chord_bracket
+    \override PianoStaff.Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
 
     \override PianoStaff.InstrumentName #'font-size = #6
     \override PianoStaff.InstrumentName #'font-shape = #'italic
diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index 1b2791c819..e5f714851b 100644
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13" 
+\version "2.7.31" 
 \header {
 
   texidoc = "The @code{\applyOutput} expression is the most flexible way to
@@ -21,7 +21,7 @@ position.
    (if (and (memq 'note-head-interface ifs)
 	(memq sp '(-2 -3 -5)))
     (begin
-     (ly:grob-set-property! gr 'stencil Text_interface::print)
+     (ly:grob-set-property! gr 'stencil ly:text-interface::print)
      (ly:grob-set-property! gr 'font-family 'roman)
      (ly:grob-set-property!
       gr 'text
diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index c7f78c45cd..00a11bed3c 100644
--- a/input/regression/balloon.ly
+++ b/input/regression/balloon.ly
@@ -3,7 +3,7 @@
   texidoc = "With balloon texts, objects in the output can be marked,
 with lines and explanatory text added."
 }
-\version "2.7.13"
+\version "2.7.31"
 
 \layout{ raggedright = ##t }
 
@@ -12,8 +12,8 @@ with lines and explanatory text added."
   \relative c'  {
 
     %% by hand:
-    \once\override Stem #'stencil = #Balloon_interface::print
-    \once\override Stem #'original-stencil = #Stem::print
+    \once\override Stem #'stencil = #ly:balloon-interface::print
+    \once\override Stem #'original-stencil = #ly:stem::print
     \once\override Stem #'balloon-text = #"I'm a stem"
     \once\override Stem #'balloon-text-offset = #'(3 . 4)
     \once\override Stem #'balloon-text-props
diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index e066c1b609..a05c709680 100644
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -1,6 +1,6 @@
 \layout{ raggedright = ##t}
 
-\version "2.7.13"
+\version "2.7.31"
 
 \header{
   texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example."
@@ -12,10 +12,10 @@
     (ly:make-simple-closure
      (list chain-grob-member-functions
       `(,cons 0 0)
-      Beam::calc_least_squares_positions
-      Beam::slope_damping
-      Beam::shift_region_to_valid
-      Beam::set_stem_lengths
+      ly:beam::calc-least-squares-positions
+      ly:beam::slope-damping
+      ly:beam::shift-region-to-valid
+      ly:beam::set-stem-lengths
     )))
 
   f4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index b27d7349d9..a774f19018 100644
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.13"
+\version "2.7.31"
 
 \header{
   texidoc="Beams in unnatural direction, have shortened stems, but do not look too short."
@@ -13,9 +13,9 @@
     (ly:make-simple-closure
      (list chain-grob-member-functions
       `(,cons 0 0)
-      Beam::calc_least_squares_positions
-      Beam::slope_damping
-      Beam::shift_region_to_valid
+      ly:beam::calc-least-squares-positions
+      ly:beam::slope-damping
+      ly:beam::shift-region-to-valid
     )))
   
   \stemUp
diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index b53496b00c..005dbbffee 100644
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -1,4 +1,4 @@
-\version "2.7.14"
+\version "2.7.31"
 
 \header  {
 
@@ -23,7 +23,7 @@ measures stretch to accomodate wide texts.
   R2.*3_\markup { \roman "a1b2c3" }
   R2.*10^"inner"^"top"_"inner"_"bot"
   \override MultiMeasureRestText  #'springs-and-rods
-    = #Multi_measure_rest::set_text_rods
+    = #ly:multi-measure-rest::set-text-rods
 
   R2.^"very very very very very very long text"
   c'2.
diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly
index 23e6ff2cd7..5d50aac3c6 100644
--- a/input/regression/spacing-folded-clef2.ly
+++ b/input/regression/spacing-folded-clef2.ly
@@ -1,4 +1,4 @@
-\version "2.7.14"
+\version "2.7.31"
 \header {
 
 texidoc = "A clef can be folded below notes in a different staff, if
@@ -11,8 +11,8 @@ can show where columns are in the score."
 
     \context {
 	\Score
-	\override NonMusicalPaperColumn  #'stencil = #Paper_column::print
-	\override PaperColumn  #'stencil = #Paper_column::print	  
+	\override NonMusicalPaperColumn  #'stencil = #ly:paper-column::print
+	\override PaperColumn  #'stencil = #ly:paper-column::print	  
 	\override NonMusicalPaperColumn #'font-family = #'roman
 	\override PaperColumn #'font-family = #'roman	  
 
diff --git a/input/regression/stencil-hacking.ly b/input/regression/stencil-hacking.ly
index 525b844499..1ca4d9ed9b 100644
--- a/input/regression/stencil-hacking.ly
+++ b/input/regression/stencil-hacking.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.14"
+\version "2.7.31"
 
 \header { texidoc=" You can write stencil callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is
@@ -18,7 +18,7 @@ Example usage:
 
   \\property NoteHead \\override #'print-function
 		   =
-		      #(parenthesize-callback Note_head::print)
+		      #(parenthesize-callback ly:note-head::print)
 		    
 "
 
@@ -55,13 +55,13 @@ GROB.  The dimensions of the stencil is not affected.
 
     \override NoteHead  #'stencil
     =
-    #(parenthesize-callback Note_head::print)
+    #(parenthesize-callback ly:note-head::print)
     g bes
     \revert NoteHead #'stencil
 
     \override Beam  #'stencil
     =
-    #(parenthesize-callback Beam::print)
+    #(parenthesize-callback ly:beam::print)
 
     a8 gis8 a2.
     
diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly
index 78b4a9f7e7..ae6fcac0ae 100644
--- a/input/test/bar-number-regular-interval.ly
+++ b/input/test/bar-number-regular-interval.ly
@@ -5,7 +5,7 @@ Bar numbers can be printed at regular intervals, inside a box or a circle.
 
 " }
 
-\version "2.7.14"
+\version "2.7.31"
 
 \relative c'{
    \override Score.BarNumber  #'break-visibility = #end-of-line-invisible
@@ -13,11 +13,11 @@ Bar numbers can be printed at regular intervals, inside a box or a circle.
    \override Score.BarNumber #'font-size = #2
 
    \override Score.BarNumber  #'stencil
-   = #(make-stencil-boxer 0.1 0.25 Text_interface::print)
+   = #(make-stencil-boxer 0.1 0.25 ly:text-interface::print)
    \repeat unfold 5 { c1 } \bar "|"
 
    \override Score.BarNumber  #'stencil
-   = #(make-stencil-circler 0.1 0.25 Text_interface::print)
+   = #(make-stencil-circler 0.1 0.25 ly:text-interface::print)
    \repeat unfold 4 { c1 } \bar "|."
 }
 
diff --git a/input/test/boxed-stencil.ly b/input/test/boxed-stencil.ly
index 6ff226d390..2a020e5c5d 100644
--- a/input/test/boxed-stencil.ly
+++ b/input/test/boxed-stencil.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.14"
+\version "2.7.31"
 \header {
   texidoc = "@cindex Boxed Stencil
 
@@ -11,15 +11,15 @@ grob. " }
 \relative c''  {
 
   \override TextScript  #'stencil =
-  #(make-stencil-boxer 0.1 0.3 Text_interface::print)
+  #(make-stencil-boxer 0.1 0.3 ly:text-interface::print)
 
   c'4^"foo"
 
   \override Stem  #'stencil =
-  #(make-stencil-boxer 0.05 0.25 Stem::print)
+  #(make-stencil-boxer 0.05 0.25 ly:stem::print)
 
   \override Score.RehearsalMark  #'stencil =
-  #(make-stencil-boxer 0.15 0.3 Text_interface::print)
+  #(make-stencil-boxer 0.15 0.3 ly:text-interface::print)
   b8
   \revert Stem #'stencil
 
diff --git a/input/test/circle.ly b/input/test/circle.ly
index 3ff498c829..3147ab6e38 100644
--- a/input/test/circle.ly
+++ b/input/test/circle.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.14"
+\version "2.7.31"
 \header {
 texidoc = "@cindex Circle
 
@@ -19,5 +19,5 @@ c1
 c2 d^\markup{\circle \finger "2"}
 \override Score.BarNumber #'break-visibility = #all-visible
 \override Score.BarNumber  #'stencil
-  = #(make-stencil-circler 0.1 0.25 Text_interface::print)
+  = #(make-stencil-circler 0.1 0.25 ly:text-interface::print)
 }
\ No newline at end of file
diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index 73806699fe..5edc1c1c62 100644
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.7.14"
+\version "2.7.31"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -173,7 +173,7 @@ oneHalfNoteTime = \markup {
       \override Staff.VerticalAxisGroup #'minimum-Y-extent = #'(2 . 2)
       
       %% Custom time signature
-      \override Staff.TimeSignature #'stencil = #Text_interface::print
+      \override Staff.TimeSignature #'stencil = #ly:text-interface::print
       \override Staff.TimeSignature #'text = #oneHalfNoteTime
       \noclefs
     
diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh
index 15243c0d8b..3eebaec544 100644
--- a/lily/include/lily-guile-macros.hh
+++ b/lily/include/lily-guile-macros.hh
@@ -87,15 +87,17 @@ inline SCM ly_symbol2scm (char const *x) { return scm_str2symbol ((x)); }
 /*
   Make TYPE::FUNC available as a Scheme function.
 */
+std::string mangle_cxx_identifier (std::string);
 #define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT)			\
   SCM TYPE ::FUNC ## _proc;						\
   void									\
   TYPE ## _ ## FUNC ## _init_functions ()				\
   {									\
-    TYPE ::FUNC ## _proc = scm_c_define_gsubr (#TYPE "::" #FUNC,	\
+    std::string id = mangle_cxx_identifier (String (#TYPE) + "::" + String (#FUNC));\
+    TYPE ::FUNC ## _proc = scm_c_define_gsubr (id.c_str(),			\
 					       (ARGCOUNT), 0, 0,	\
 					       (Scheme_function_unknown) TYPE::FUNC); \
-    scm_c_export (#TYPE "::" #FUNC, NULL);				\
+    scm_c_export (id.c_str (), NULL);					\
   }									\
 									\
   ADD_SCM_INIT_FUNC (TYPE ## _ ## FUNC ## _callback,			\
diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 2440ae8d99..00ed6ad386 100644
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -93,7 +93,8 @@ private:
 bool is_child_context (Context *me, Context *child);
 
 #define IMPLEMENT_CTOR_CALLBACK(Class)					\
-  LY_DEFINE_MEMBER_FUNCTION (Class, constructor, #Class "::constructor", \
+  LY_DEFINE_MEMBER_FUNCTION (Class, constructor, \
+			     mangle_cxx_identifier (std::string (#Class) + "::constructor").c_str(), \
 			     0, 0, 0,					\
 			     (),					\
 			     "")					\
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 6f70bae5f5..aa6a9cc40d 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -721,3 +721,22 @@ procedure_arity (SCM proc)
   SCM fixed = scm_car (arity);
   return scm_to_int (fixed);
 }
+
+std::string
+mangle_cxx_identifier (std::string cxx_id)
+{
+  if (cxx_id.substr (0, 3) == "ly_")
+    cxx_id = cxx_id.replace (0, 3, "ly:");
+  else
+    {
+      cxx_id = String_convert::to_lower (cxx_id);
+      cxx_id = "ly:" + cxx_id;
+    }
+  if (cxx_id.substr (cxx_id.length () - 2) == "_p")
+    cxx_id = cxx_id.replace (cxx_id.length () - 2, 1, "?");
+  else if (cxx_id.substr (cxx_id.length () - 2) == "_x")
+    cxx_id = cxx_id.replace (cxx_id.length () - 2, 1, "!");
+
+  cxx_id = replace_all (cxx_id, '_', '-');
+  return cxx_id;
+}
diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 00a5538dc2..326b975028 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -6,9 +6,6 @@
   (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-/*
-  UGH. too many includes.
-*/
 
 #include "music-iterator.hh"
 
diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index 1982279800..3d9c657d7b 100755
--- a/ly/bagpipe.ly
+++ b/ly/bagpipe.ly
@@ -6,10 +6,10 @@
   Sven Axelsson, the Murray Pipes & Drums of Gothenburg
   (http://www.murrays.nu)
   
-  $Id: bagpipe.ly,v 1.8 2005/10/21 14:07:47 hanwen Exp $
+  $Id: bagpipe.ly,v 1.9 2006/01/31 23:52:53 hanwen Exp $
 %}
 
-\version "2.7.14"
+\version "2.7.31"
 
 % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
 % Flat notes used mainly in some modern music.
@@ -45,7 +45,7 @@ hideKeySignature = {
 }
 showKeySignature = {
   % Show the key signature e.g. for BMW compatibility.
-  \override Staff.KeySignature  #'stencil = #'Key_signature_interface::print
+  \override Staff.KeySignature  #'stencil = #'ly:key-signature-interface::print
   \set Staff.extraNatural = ##f
   \key d \major
   #(set-accidental-style 'forget)
diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 307dc3f6b5..63f70023c4 100644
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.14"
+\version "2.7.31"
 
 %%%%%%%%
 %%%%%%%% shortcuts common for all styles of gregorian chant notation
@@ -56,7 +56,7 @@ caesura = {
   \breathe
 }
 divisioMinima = {
-  \once \override BreathingSign  #'stencil = #Breathing_sign::divisio_minima
+  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-minima
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
   \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
@@ -64,7 +64,7 @@ divisioMinima = {
   \breathe
 }
 divisioMaior = {
-  \once \override BreathingSign  #'stencil = #Breathing_sign::divisio_maior
+  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maior
   \once \override BreathingSign  #'Y-offset = #0
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
@@ -73,7 +73,7 @@ divisioMaior = {
   \breathe
 }
 divisioMaxima = {
-  \once \override BreathingSign  #'stencil = #Breathing_sign::divisio_maxima
+  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maxima
   \once \override BreathingSign  #'Y-offset = #0
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
@@ -82,7 +82,7 @@ divisioMaxima = {
   \breathe
 }
 finalis = {
-  \once \override BreathingSign  #'stencil = #Breathing_sign::finalis
+  \once \override BreathingSign  #'stencil = #ly:breathing-sign::finalis
   \once \override BreathingSign  #'Y-offset = #0
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
diff --git a/ly/init.ly b/ly/init.ly
index e9b5a76398..677f4347b6 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,6 +1,6 @@
 %% Toplevel initialisation file. 
 
-% switch on debugging.
+%% switch on debugging.
 #(if (and #t (defined? 'set-debug-cell-accesses!))
   (set-debug-cell-accesses! 5000))
 
diff --git a/ly/property-init.ly b/ly/property-init.ly
index 18e3386511..7fe0219e47 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.7.14"
+\version "2.7.31"
 
 stemUp = \override Stem  #'direction = #UP
 stemDown = \override Stem  #'direction = #DOWN 
@@ -52,7 +52,7 @@ tieSolid = {
 }
 
 setEasyHeads = \sequential {
-  \override NoteHead  #'stencil = #Note_head::brew_ez_stencil
+  \override NoteHead  #'stencil = #ly:note-head::brew-ez-stencil
   \override NoteHead #'font-size = #-7
   \override NoteHead #'font-family = #'sans
   \override NoteHead #'font-series = #'bold
@@ -151,7 +151,7 @@ arpeggioNeutral = \sequential {
   \revert Arpeggio  #'arpeggio-direction
 }
 arpeggioBracket = \sequential {
-  \override Arpeggio #'stencil = #Arpeggio::brew_chord_bracket
+  \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
 }
 
 glissando = #(make-music 'GlissandoEvent)
diff --git a/python/convertrules.py b/python/convertrules.py
index 343f782807..2cbc931f64 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2687,3 +2687,17 @@ def conv (str):
 
 conversions.append (((2, 7, 30), conv,
 		     """\\epsfile"""))
+
+
+def conv (str):
+	def sub_cxx_id (m):
+		str = m.group(1)
+		return 'ly:' + str.lower ().replace ('_','-')
+		
+	str = re.sub (r'([A-Z][a-z_0-9]+::[a-z_0-9]+)',
+		      sub_cxx_id, str)
+	return str
+
+conversions.append (((2, 7, 31), conv,
+		     """Foo_bar::bla_bla -> ly:foo-bar::bla-bla"""))
+
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 53ad479a5a..5d530ab5d2 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -551,7 +551,7 @@ debugging")
      (stem-info ,pair? "caching of stem parameters")
      (note-columns ,pair? "list of NoteColumn grobs.")
 
-;;; add-join would be enough if in Mensural_ligature::brew_ligature_primitive
+;;; add-join would be enough if in ly:mensural-ligature::brew-ligature-primitive
 ;;; the next note could be seen
      (join-right-amount ,number? "")
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 6a871d11cd..ea41007c0a 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -22,9 +22,9 @@
 	(avoid-slur . inside)
 	(cautionary-style . parentheses)
 
-	(stencil . ,Accidental_interface::print)
+	(stencil . ,ly:accidental-interface::print)
 	(after-line-breaking
-	 . ,Accidental_interface::after_line_breaking)
+	 . ,ly:accidental-interface::after-line-breaking)
 					
 	(meta . ((class . Item)
 		 (interfaces . (accidental-interface
@@ -32,15 +32,15 @@
     
     (AccidentalSuggestion
      . (
-	(stencil . ,Accidental_interface::print)
+	(stencil . ,ly:accidental-interface::print)
 	(X-offset . ,(ly:make-simple-closure
 		      `(,+
-			,(ly:make-simple-closure (list Self_alignment_interface::centered_on_x_parent))
-			,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
+			,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
+			,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
 	(self-alignment-X . ,CENTER)
 	(cautionary . #t)
 	(cautionary-style . smaller)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(cautionary-style . parentheses)
 	(direction . ,UP)
 	(staff-padding . 0.25)
@@ -57,8 +57,8 @@
      . (
 	(left-padding . 0.2)
 
-	(positioning-done . ,Accidental_placement::calc_positioning_done)
-	(X-extent . ,Axis_group_interface::width)		      
+	(positioning-done . ,ly:accidental-placement::calc-positioning-done)
+	(X-extent . ,ly:axis-group-interface::width)		      
 	
 	;; this is quite small, but it is very ugly to have
 	;; accs closer to the previous note than to the next one.
@@ -68,8 +68,8 @@
     (Ambitus
      . (
 	(axes . (0 1))
-	(X-extent . ,Axis_group_interface::width)
-	(X-extent . ,Axis_group_interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
+	(X-extent . ,ly:axis-group-interface::height)
 
 	(space-alist . (
 			(clef . (extra-space . 0.5))
@@ -88,11 +88,11 @@
     (AmbitusLine
      . (
 
-	(stencil . ,Ambitus::print)
+	(stencil . ,ly:ambitus::print)
 
 	(join-heads . #t)
 	(thickness . 2)
-	(X-offset . ,Self_alignment_interface::centered_on_x_parent)
+	(X-offset . ,ly:self-alignment-interface::centered-on-x-parent)
 
 	(meta . ((class . Item)
 		 (interfaces . (ambitus-interface
@@ -102,12 +102,12 @@
      . (
 	(font-family . music)
 	(padding . 0.5)
-	(X-offset . ,Side_position_interface::x_aligned_side)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
 	(cautionary-style . parentheses)
 
-	(stencil . ,Accidental_interface::print)
-	(after-line-breaking . ,Accidental_interface::after_line_breaking)
+	(stencil . ,ly:accidental-interface::print)
+	(after-line-breaking . ,ly:accidental-interface::after-line-breaking)
 	(side-axis . ,X)
 	
 	(meta . ((class . Item)
@@ -121,10 +121,10 @@
      . (
 	(duration-log . 2)
 
-	(stencil . ,Note_head::print)
+	(stencil . ,ly:note-head::print)
 	(glyph-name . ,note-head::calc-glyph-name)
 	
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
 				note-head-interface
@@ -134,10 +134,10 @@
 				ledgered-interface))))))
 
     (Arpeggio
-     . ((X-extent . ,Arpeggio::width)
-	(stencil . ,Arpeggio::print)
-	(Y-offset . ,Staff_symbol_referencer::callback)
-	(X-offset . ,Side_position_interface::x_aligned_side)
+     . ((X-extent . ,ly:arpeggio::width)
+	(stencil . ,ly:arpeggio::print)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
 	(padding . 0.5)
 	(side-axis . ,X)
@@ -156,9 +156,9 @@
 	(break-visibility . ,all-visible)
 	(breakable . #t)
 
-	(stencil . ,Bar_line::print)
+	(stencil . ,ly:bar-line::print)
 	(glyph-name . ,bar-line::calc-glyph-name)
-	(bar-size .  ,Bar_line::calc_bar_size)
+	(bar-size .  ,ly:bar-line::calc-bar-size)
 	
 	(space-alist . (
 			(time-signature . (extra-space . 0.75))
@@ -186,16 +186,16 @@
 
     (BarNumber
      . (
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 	(breakable . #t)
 	(break-visibility . ,begin-of-line-visible)
 	(padding . 1.0)
 	(direction . ,UP)
 	(font-family . roman)
 	(font-size . -2)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
-	(X-offset . ,Self_alignment_interface::x_aligned_on_self)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(self-alignment-X . 1)
 
 	(meta .
@@ -210,7 +210,7 @@
     (BassFigure
      . (
 	;
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
@@ -220,7 +220,7 @@
     (BassFigureBracket
      . (
 	;
-	(stencil . ,Enclosing_bracket::print)
+	(stencil . ,ly:enclosing-bracket::print)
 
 	(edge-height . (0.2 . 0.2))
 	(meta . ((class . Item)
@@ -229,9 +229,9 @@
     (BassFigureContinuation
      . (
 
-	(stencil . ,Figured_bass_continuation::print)
+	(stencil . ,ly:figured-bass-continuation::print)
 
-	(Y-offset . ,Figured_bass_continuation::center_on_figures)
+	(Y-offset . ,ly:figured-bass-continuation::center-on-figures)
 	(meta . ((class . Spanner)
 		 (interfaces . (figured-bass-continuation-interface))
 		 ))))
@@ -239,7 +239,7 @@
      . (
 	(axes . (,Y))
 
-	(Y-extent . ,Axis_group_interface::height)
+	(Y-extent . ,ly:axis-group-interface::height)
 
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
@@ -250,8 +250,8 @@
 	(axes . (,Y))
 	(threshold . (2 . 1000))
 
-	(positioning-done . ,Align_interface::calc_positioning_done)
-	(Y-extent . ,Axis_group_interface::height)
+	(positioning-done . ,ly:align-interface::calc-positioning-done)
+	(Y-extent . ,ly:axis-group-interface::height)
 					
 	(stacking-dir . -1)
 	(meta . ((class . Spanner)
@@ -267,19 +267,19 @@
 			(ly:make-simple-closure
 			 (list chain-grob-member-functions
 			   `(,cons 0 0)
-			   Beam::calc_least_squares_positions
-			   Beam::slope_damping
-			   Beam::shift_region_to_valid
-			   Beam::quanting
+			   ly:beam::calc-least-squares-positions
+			   ly:beam::slope-damping
+			   ly:beam::shift-region-to-valid
+			   ly:beam::quanting
 			   ))))
 
 	;; this is a hack to set stem lengths, if positions is set.
-	(quantized-positions . ,Beam::set_stem_lengths)
-	(concaveness . ,Beam::calc_concaveness)
-	(direction . ,Beam::calc_direction)
-	(shorten . ,Beam::calc_stem_shorten)
-	(beaming . ,Beam::calc_beaming)
-	(stencil . ,Beam::print)
+	(quantized-positions . ,ly:beam::set-stem-lengths)
+	(concaveness . ,ly:beam::calc-concaveness)
+	(direction . ,ly:beam::calc-direction)
+	(shorten . ,ly:beam::calc-stem-shorten)
+	(beaming . ,ly:beam::calc-beaming)
+	(stencil . ,ly:beam::print)
 
 	;; TODO: should be in SLT.
 	(thickness . 0.48) ; in staff-space
@@ -314,8 +314,8 @@
 	(breakable . #t)
 	(stacking-dir . 1)
 
-	(positioning-done . ,Break_align_interface::calc_positioning_done)
-	(X-extent . ,Axis_group_interface::width)
+	(positioning-done . ,ly:break-align-interface::calc-positioning-done)
+	(X-extent . ,ly:axis-group-interface::width)
 					
 	(break-align-orders . ;; end of line
 			    #((instrument-name
@@ -361,7 +361,7 @@
      . (
 	(axes . (0))
 
-	(X-extent . ,Axis_group_interface::width)
+	(X-extent . ,ly:axis-group-interface::width)
 
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
@@ -381,10 +381,10 @@
 			(first-note . (fixed-space . 1.0)) ;huh?
 			(right-edge . (extra-space . 0.1))))
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(text . ,(make-musicglyph-markup "scripts.rcomma"))
-	(Y-offset . ,Breathing_sign::offset_callback)
+	(Y-offset . ,ly:breathing-sign::offset-callback)
 	(break-visibility . ,begin-of-line-invisible)
 	(meta . ((class . Item)
 		 (interfaces . (break-aligned-interface
@@ -395,8 +395,8 @@
     (Clef
      . (
 
-	(stencil . ,Clef::print)
-	(glyph-name . ,Clef::calc_glyph_name)
+	(stencil . ,ly:clef::print)
+	(glyph-name . ,ly:clef::calc-glyph-name)
 					
 	(breakable . #t)
 	(font-family . music)
@@ -410,7 +410,7 @@
 			(first-note . (minimum-fixed-space . 5.0))
 			(next-note . (extra-space . 0.5))
 			(right-edge . (extra-space . 0.5))))
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (clef-interface
 				staff-symbol-referencer-interface
@@ -420,7 +420,7 @@
     (ClusterSpannerBeacon
      . (
 
-	(Y-extent . ,Cluster_beacon::height)
+	(Y-extent . ,ly:cluster-beacon::height)
 
 	(meta . ((class . Item)
 		 (interfaces . (cluster-beacon-interface))))))
@@ -428,8 +428,8 @@
     (ClusterSpanner
      . (
 
-	(springs-and-rods . ,Spanner::set_spacing_rods)
-	(stencil . ,Cluster::print)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
+	(stencil . ,ly:cluster::print)
 
 
 	(minimum-length . 0.0)
@@ -441,8 +441,8 @@
     (ChordName
      . (
 
-	(stencil . ,Text_interface::print)
-	(after-line-breaking . ,Chord_name::after_line_breaking)
+	(stencil . ,ly:text-interface::print)
+	(after-line-breaking . ,ly:chord-name::after-line-breaking)
 	
 	(word-space . 0.0)
 	(font-family . sans)
@@ -457,11 +457,11 @@
     (CombineTextScript
      . (
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(no-spacing-rods . #t)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
-	(X-offset . ,Self_alignment_interface::x_aligned_on_self)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(direction . ,UP)
 	(padding . 0.5)
 	(staff-padding . 0.5)
@@ -481,12 +481,12 @@
 	(break-align-symbol . custos)
 	(breakable . #t)
 
-	(stencil . ,Custos::print)
+	(stencil . ,ly:custos::print)
 
 	(break-visibility . ,end-of-line-visible)
 	(style . vaticana)
 	(neutral-direction . ,DOWN)
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(space-alist . (
 			(first-note . (minimum-fixed-space . 0.0))
 			(right-edge . (extra-space . 0.1))))
@@ -502,10 +502,10 @@
 	(axes . (0))
 	(direction . ,RIGHT)
 
-	(positioning-done . ,Dot_column::calc_positioning_done) 
-	(X-extent . ,Axis_group_interface::width)
+	(positioning-done . ,ly:dot-column::calc-positioning-done) 
+	(X-extent . ,ly:axis-group-interface::width)
 	
-	(X-offset . ,Dot_column::side_position)
+	(X-offset . ,ly:dot-column::side-position)
 	(meta . ((class . Item)
 		 (interfaces . (dot-column-interface
 				axis-group-interface))))))
@@ -513,7 +513,7 @@
     (Dots
      . (
 
-	(stencil . ,Dots::print)
+	(stencil . ,ly:dots::print)
 
 	(dot-count . 1)
 	(meta . ((class . Item)
@@ -523,7 +523,7 @@
 
     (DoublePercentRepeat
      . (
-	(stencil . ,Percent_repeat_item_interface::double_percent)
+	(stencil . ,ly:percent-repeat-item-interface::double-percent)
 	(breakable . #t)
 	(slope . 1.0)
 	(font-encoding . fetaMusic)
@@ -539,10 +539,10 @@
     (DoublePercentRepeatCounter
      . (
 
-	(stencil . ,Text_interface::print)
-	(X-offset . ,(ly:make-simple-closure `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::centered_on_y_parent))
-						  ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(stencil . ,ly:text-interface::print)
+	(X-offset . ,(ly:make-simple-closure `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-y-parent))
+						  ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(font-encoding . fetaNumber)
 	(self-alignment-X . 0)
 	(font-size . -2) 
@@ -559,7 +559,7 @@
     (DynamicLineSpanner
      . (
 	(axes . (1))
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(staff-padding . 0.1)
 	(padding . 0.6)
 	(avoid-slur . outside)
@@ -568,8 +568,8 @@
 	(direction . ,DOWN)
 	(side-axis . ,Y)
 
-	(Y-extent . ,Axis_group_interface::height)
-	(X-extent . ,Axis_group_interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 
 
 	(meta . ((class . Spanner)
@@ -583,12 +583,12 @@
 
 	;; todo.
 
-	(stencil . ,Text_interface::print)
-	(direction . ,Script_interface::calc_direction)
+	(stencil . ,ly:text-interface::print)
+	(direction . ,ly:script-interface::calc-direction)
 
-	(X-offset . ,Self_alignment_interface::x_aligned_on_self)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(self-alignment-X . 0)
-	(Y-offset . ,Self_alignment_interface::y_aligned_on_self)
+	(Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
 	(self-alignment-Y . 0)
 	(font-series . bold)
 	(font-encoding . fetaDynamic)
@@ -606,7 +606,7 @@
     (DynamicTextSpanner
      . (
 
-	(stencil . ,Dynamic_text_spanner::print)
+	(stencil . ,ly:dynamic-text-spanner::print)
 
 	;; rather ugh with NCSB
 	;; (font-series . bold)
@@ -638,8 +638,8 @@
 	(self-alignment-Y . 0)
 	(script-priority . 100)
 
-	(stencil . ,Text_interface::print)
-	(direction . ,Script_interface::calc_direction)
+	(stencil . ,ly:text-interface::print)
+	(direction . ,ly:script-interface::calc-direction)
 
 	(font-encoding . fetaNumber)
 	(font-size . -5) 		; don't overlap when next to heads.
@@ -660,8 +660,8 @@
 	(X-extent . #f)
 	(Y-extent . #f)
 
-	(stencil . ,Line_spanner::print)
-	(after-line-breaking . ,Line_spanner::after_line_breaking)
+	(stencil . ,ly:line-spanner::print)
+	(after-line-breaking . ,ly:line-spanner::after-line-breaking)
 	
 
 	(meta . ((class . Spanner)
@@ -678,13 +678,13 @@
     (GridLine
      . (
 
-	(X-extent  . ,Grid_line_interface::width)
-	(stencil . ,Grid_line_interface::print)
+	(X-extent  . ,ly:grid-line-interface::width)
+	(stencil . ,ly:grid-line-interface::print)
 
 	(self-alignment-X . ,CENTER)
 	(X-offset . ,(ly:make-simple-closure
-		      `(,+  ,(ly:make-simple-closure (list Self_alignment_interface::centered_on_x_parent))
-			    ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
+		      `(,+  ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent))
+			    ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
 	(layer . 0)
 	(meta . ((class . Item)
 		 (interfaces . (self-alignment-interface
@@ -694,16 +694,16 @@
      . (
 
 
-	(stencil . ,Hairpin::print)
-	(springs-and-rods . ,Spanner::set_spacing_rods)
-	(after-line-breaking . ,Hairpin::after_line_breaking)
+	(stencil . ,ly:hairpin::print)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
+	(after-line-breaking . ,ly:hairpin::after-line-breaking)
 
 	(thickness . 1.0)
 	(height . 0.6666)
 	(minimum-length . 2.0)
 	(bound-padding . 1.0)
 	(self-alignment-Y . 0)
-	(Y-offset . ,Self_alignment_interface::y_aligned_on_self)
+	(Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
 	(meta . ((class . Spanner)
 		 (interfaces . (hairpin-interface
 				line-interface
@@ -714,8 +714,8 @@
     (HorizontalBracket
      . (
 	(thickness . 1.0)
-	(stencil . ,Horizontal_bracket::print)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(stencil . ,ly:horizontal-bracket::print)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(padding . 0.2)
 	(staff-padding . 0.2)
 	(direction . ,DOWN)
@@ -729,8 +729,8 @@
     (InstrumentName
      . (
 	(breakable . #t)
-	(Y-offset . ,(ly:make-simple-closure `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::y_aligned_on_self))
-						  ,(ly:make-simple-closure (list Side_position_interface::y_aligned_on_support_refpoints)))))
+	(Y-offset . ,(ly:make-simple-closure `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::y-aligned-on-self))
+						  ,(ly:make-simple-closure (list ly:side-position-interface::y-aligned-on-support-refpoints)))))
 	
 	;; This direction is for aligned_on_support_refpoints
 	;; (?) --hwn
@@ -739,7 +739,7 @@
 			(left-edge . (extra-space . 1.0))))
 
 	(self-alignment-Y . 0)
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 	(break-align-symbol . instrument-name)
 	(break-visibility . ,begin-of-line-visible)
 	(baseline-skip . 2)
@@ -754,7 +754,7 @@
     (KeyCancellation
      . (
 
-	(stencil . ,Key_signature_interface::print)
+	(stencil . ,ly:key-signature-interface::print)
 
 	(space-alist . (
 			(time-signature . (extra-space . 1.25))
@@ -762,7 +762,7 @@
 			(key-signature . (extra-space . 0.5))
 			(right-edge . (extra-space . 0.5))
 			(first-note . (fixed-space . 2.5))))
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(break-align-symbol . key-cancellation)
 	(break-visibility . ,begin-of-line-invisible)
 	(breakable . #t)
@@ -774,14 +774,14 @@
     (KeySignature
      . (
 
-	(stencil . ,Key_signature_interface::print)
+	(stencil . ,ly:key-signature-interface::print)
 
 	(space-alist . (
 			(time-signature . (extra-space . 1.15))
 			(staff-bar . (extra-space . 1.1))
 			(right-edge . (extra-space . 0.5))
 			(first-note . (fixed-space . 2.5))))
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(break-align-symbol . key-signature)
 	(break-visibility . ,begin-of-line-visible)
 	(breakable . #t)
@@ -793,9 +793,9 @@
     (LaissezVibrerTie
      . (
 
-	(stencil  . ,Tie::print)
-	(control-points . ,Laissez_vibrer_tie::calc_control_points)
-	(direction . ,Laissez_vibrer_tie::calc_direction)
+	(stencil  . ,ly:tie::print)
+	(control-points . ,ly:laissez-vibrer-tie::calc-control-points)
+	(direction . ,ly:laissez-vibrer-tie::calc-direction)
 	
 	(details . ((ratio . 0.333)
 		    (height-limit . 1.0)))
@@ -809,7 +809,7 @@
      . (
 	(X-extent . #f)
 	(Y-extent . #f)
-	(positioning-done . ,Laissez_vibrer_tie_column::calc_positioning_done)
+	(positioning-done . ,ly:laissez-vibrer-tie-column::calc-positioning-done)
 	(meta . ((class . Item)
 		 (interfaces . (laissez-vibrer-tie-column-interface))
 		 ))
@@ -818,9 +818,9 @@
     (LedgerLineSpanner
      . (
 
-	(springs-and-rods . ,Ledger_line_spanner::set_spacing_rods)
+	(springs-and-rods . ,ly:ledger-line-spanner::set-spacing-rods)
 
-	(stencil . ,Ledger_line_spanner::print)
+	(stencil . ,ly:ledger-line-spanner::print)
 
 	(X-extent . #f)
 	(Y-extent . #f)
@@ -861,8 +861,8 @@
 	(edge-height . (0.7 . 0.7))
 	(shorten-pair . (-0.2 . -0.2))
 	(direction . ,UP)
-	(positions . ,Tuplet_bracket::calc_positions)
-	(stencil . ,Tuplet_bracket::print)
+	(positions . ,ly:tuplet-bracket::calc-positions)
+	(stencil . ,ly:tuplet-bracket::print)
 	
 	(meta . ((class . Spanner)
 		 (interfaces . (tuplet-bracket-interface
@@ -877,9 +877,9 @@
 	(minimum-length . 0.3)
 	(minimum-distance . 0.1)
 	(padding . 0.07)
-	(springs-and-rods . ,Hyphen_spanner::set_spacing_rods)
+	(springs-and-rods . ,ly:hyphen-spanner::set-spacing-rods)
 	
-	(stencil . ,Hyphen_spanner::print)
+	(stencil . ,ly:hyphen-spanner::print)
 
 	(Y-extent . (0 . 0))
 	(meta . ((class . Spanner)
@@ -891,7 +891,7 @@
     (LyricExtender
      . (
 
-	(stencil . ,Lyric_extender::print)
+	(stencil . ,ly:lyric-extender::print)
 
 	(thickness . 0.8) ; linethickness
 	(minimum-length . 1.5)
@@ -902,7 +902,7 @@
 
     (LyricSpace
      . ((minimum-distance . 0.3)
-	(springs-and-rods . ,Hyphen_spanner::set_spacing_rods)
+	(springs-and-rods . ,ly:hyphen-spanner::set-spacing-rods)
 	(padding . 0.0)
 	(Y-extent . #f)
 	(X-extent . #f)
@@ -914,9 +914,9 @@
     (LyricText
      . (
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
-	(X-offset . ,Self_alignment_interface::aligned_on_x_parent)
+	(X-offset . ,ly:self-alignment-interface::aligned-on-x-parent)
 	(self-alignment-X . 0)
 	(word-space . 0.6)
 	(font-series . bold-narrow)
@@ -931,10 +931,10 @@
 
     (MeasureGrouping
      . (
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 
-	(stencil . ,Measure_grouping::print)
+	(stencil . ,ly:measure-grouping::print)
 
 	(padding . 2)
 	(direction . ,UP)
@@ -954,7 +954,7 @@
      . (
 	(thickness . 1.4)
 	(flexa-width . 2.0)
-	(stencil . ,Mensural_ligature::print)
+	(stencil . ,ly:mensural-ligature::print)
 
 	(meta . ((class . Spanner)
 		 (interfaces . (mensural-ligature-interface
@@ -963,9 +963,9 @@
     (MetronomeMark
      . (
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(direction . ,UP)
 	(padding . 0.8)
 	(side-axis . ,Y)
@@ -978,9 +978,9 @@
 
     (MultiMeasureRest
      . (
-	(stencil . ,Multi_measure_rest::print)
-	(springs-and-rods . ,Multi_measure_rest::set_spacing_rods)
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(stencil . ,ly:multi-measure-rest::print)
+	(springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(staff-position . 0)
 	(expand-limit . 10)
 	(thick-thickness . 6.6)
@@ -996,12 +996,12 @@
 
     (MultiMeasureRestNumber
      . (
-	(springs-and-rods . ,Multi_measure_rest::set_spacing_rods)
-	(stencil . ,Text_interface::print)
+	(springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
+	(stencil . ,ly:text-interface::print)
 	(X-offset . ,(ly:make-simple-closure
-		      `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self))
-			   ,(ly:make-simple-closure (list Self_alignment_interface::x_centered_on_y_parent)))))
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self))
+			   ,(ly:make-simple-closure (list ly:self-alignment-interface::x-centered-on-y-parent)))))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 
 	(self-alignment-X . 0)
@@ -1019,12 +1019,12 @@
 
     (MultiMeasureRestText
      . (
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 	(X-offset . ,(ly:make-simple-closure
-		      `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::x_centered_on_y_parent))
-			   ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
+		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-centered-on-y-parent))
+			   ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
 	
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(self-alignment-X . 0)
 	(direction . ,UP)
 	(padding . 0.2)
@@ -1040,9 +1040,9 @@
      . (
 	(axes . (0 1))
 
-	(X-extent . ,Axis_group_interface::width)
-	(Y-extent . ,Axis_group_interface::height)
-	(positioning-done . ,Note_collision_interface::calc_positioning_done)
+	(X-extent . ,ly:axis-group-interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
+	(positioning-done . ,ly:note-collision-interface::calc-positioning-done)
 	
 	(meta . ((class . Item)
 		 (interfaces . (note-collision-interface
@@ -1051,8 +1051,8 @@
     (NoteColumn
      . (
 	(axes . (0 1))
-	(X-extent . ,Axis_group_interface::width)
-	(Y-extent . ,Axis_group_interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
 
 	(meta . ((class . Item)
 		 (interfaces . (axis-group-interface
@@ -1061,11 +1061,11 @@
     (NoteHead
      . (
 
-	(stencil . ,Note_head::print)
-	(stem-attachment . ,Note_head::calc_stem_attachment)
+	(stencil . ,ly:note-head::print)
+	(stem-attachment . ,ly:note-head::calc-stem-attachment)
 	(glyph-name . ,note-head::calc-glyph-name) 
-	(Y-offset . ,Staff_symbol_referencer::callback)
-	(X-offset . ,Note_head::stem_x_shift)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
+	(X-offset . ,ly:note-head::stem-x-shift)
 	(meta . ((class . Item)
 		 (interfaces . (rhythmic-grob-interface
 				rhythmic-head-interface
@@ -1089,7 +1089,7 @@
     (NoteName
      . (
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(meta . ((class . Item)
 		 (interfaces . (note-name-interface
@@ -1101,12 +1101,12 @@
 	(self-alignment-X . 0)
 	(break-visibility . ,begin-of-line-visible)
 	(X-offset . ,(ly:make-simple-closure
-		      `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self))
-			   ,(ly:make-simple-closure (list Self_alignment_interface::centered_on_x_parent)))))
+		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self))
+			   ,(ly:make-simple-closure (list ly:self-alignment-interface::centered-on-x-parent)))))
 	
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 
 	;; no Y dimensions, because of lyrics under tenor clef.
@@ -1123,9 +1123,9 @@
 
     (OttavaBracket
      . (
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 
-	(stencil . ,Ottava_bracket::print)
+	(stencil . ,ly:ottava-bracket::print)
 
 	(font-shape . italic)
 	(shorten-pair . (0.0 . -0.6))
@@ -1147,9 +1147,9 @@
      . (
 	(axes . (0))
 
-	(before-line-breaking . ,Paper_column::before_line_breaking)
-	;; (stencil . ,Paper_column::print)
-	(X-extent . ,Axis_group_interface::width)
+	(before-line-breaking . ,ly:paper-column::before-line-breaking)
+	;; (stencil . ,ly:paper-column::print)
+	(X-extent . ,ly:axis-group-interface::width)
 	
 
 	;; debugging
@@ -1162,11 +1162,11 @@
     (PhrasingSlur
      . ((details . ,default-slur-details)
 
-	(control-points . ,Slur::calc_control_points)
-	(direction . ,Slur::calc_direction)
-	(springs-and-rods . ,Spanner::set_spacing_rods)
-	(Y-extent . ,Slur::height)
-	(stencil . ,Slur::print)		      
+	(control-points . ,ly:slur::calc-control-points)
+	(direction . ,ly:slur::calc-direction)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
+	(Y-extent . ,ly:slur::height)
+	(stencil . ,ly:slur::print)		      
 	
 
 	(thickness . 1.1)
@@ -1180,9 +1180,9 @@
      . (
 	(axes . (0))
 
-	(before-line-breaking . ,Paper_column::before_line_breaking)
-	(X-extent . ,Axis_group_interface::width)
-	;;		      (stencil . ,Paper_column::print)
+	(before-line-breaking . ,ly:paper-column::before-line-breaking)
+	(X-extent . ,ly:axis-group-interface::width)
+	;;		      (stencil . ,ly:paper-column::print)
 	
 	(breakable . #t)
 
@@ -1197,8 +1197,8 @@
     (PercentRepeat
      . (
 
-	(springs-and-rods . ,Multi_measure_rest::set_spacing_rods)
-	(stencil . ,Multi_measure_rest::percent)
+	(springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
+	(stencil . ,ly:multi-measure-rest::percent)
 
 	(slope . 1.0)
 	(thickness . 0.48)
@@ -1209,11 +1209,11 @@
 				percent-repeat-interface))))))
     (PercentRepeatCounter
      . (
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 	(X-offset . ,(ly:make-simple-closure
-		      `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::x_centered_on_y_parent))
-			   ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-centered-on-y-parent))
+			   ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self)))))
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(self-alignment-X . 0)
 	(direction . ,UP)
 	(padding . 0.2)
@@ -1231,7 +1231,7 @@
     (PianoPedalBracket
      . (
 
-	(stencil . ,Piano_pedal_bracket::print)
+	(stencil . ,ly:piano-pedal-bracket::print)
 
 	(style . line)
 	(bound-padding . 1.0)
@@ -1247,14 +1247,14 @@
 
     (RehearsalMark
      . (
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 	(X-offset . ,(ly:make-simple-closure
 		      `(,+ ,(ly:make-simple-closure
-			     `(,Self_alignment_interface::x_aligned_on_self))
+			     `(,ly:self-alignment-interface::x-aligned-on-self))
 			   ,(ly:make-simple-closure
-			     `(,Self_alignment_interface::centered_on_x_parent)))
+			     `(,ly:self-alignment-interface::centered-on-x-parent)))
 		      ))
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(self-alignment-X . 0)
 	(direction . ,UP)
 	(breakable . #t)
@@ -1272,17 +1272,17 @@
 
     (RepeatSlash
      . (
-	(stencil . ,Percent_repeat_item_interface::beat_slash)
+	(stencil . ,ly:percent-repeat-item-interface::beat-slash)
 	(thickness . 0.48)
 	(slope . 1.7)
 	(meta . ((class . Item)
 		 (interfaces . (percent-repeat-interface))))))
     (Rest
      . (
-	(stencil . ,Rest::print)
-	(X-extent . ,Rest::width)
-	(Y-extent . ,Rest::height)
-	(Y-offset . ,Rest::y_offset_callback)
+	(stencil . ,ly:rest::print)
+	(X-extent . ,ly:rest::width)
+	(Y-extent . ,ly:rest::height)
+	(Y-offset . ,ly:rest::y-offset-callback)
 	(minimum-distance . 0.25)
 	(meta . ((class . Item)
 		 (interfaces . (font-interface
@@ -1294,7 +1294,7 @@
     (RestCollision
      . (
 	(minimum-distance . 0.75)
-	(positioning-done . ,Rest_collision::calc_positioning_done)
+	(positioning-done . ,ly:rest-collision::calc-positioning-done)
 					
 	(meta . ((class . Item)
 		 (interfaces . (rest-collision-interface))))))
@@ -1308,11 +1308,11 @@
 	(padding . 0.20)
 	(staff-padding . 0.25)
 	;; (script-priority . 0) priorities for scripts, see script.scm
-	(X-offset . , Self_alignment_interface::centered_on_x_parent)
+	(X-offset . , ly:self-alignment-interface::centered-on-x-parent)
 	
 
-	(stencil . ,Script_interface::print)
-	(direction . ,Script_interface::calc_direction)
+	(stencil . ,ly:script-interface::print)
+	(direction . ,ly:script-interface::calc-direction)
 
 	(font-encoding . fetaMusic)
 	(meta . ((class . Item)
@@ -1323,7 +1323,7 @@
     (ScriptColumn
      . (
 
-	(before-line-breaking . ,Script_column::before_line_breaking)
+	(before-line-breaking . ,ly:script-column::before-line-breaking)
 
 	(meta . ((class . Item)
 		 (interfaces . (script-column-interface))))))
@@ -1339,7 +1339,7 @@
     (SeparatingGroupSpanner
      . (
 
-	(springs-and-rods . ,Separating_group_spanner::set_spacing_rods)
+	(springs-and-rods . ,ly:separating-group-spanner::set-spacing-rods)
 
 	(meta . ((class . Spanner)
 		 (interfaces . (only-prebreak-interface
@@ -1349,15 +1349,15 @@
     (Slur
      . ((details . ,default-slur-details)
 
-	(control-points . ,Slur::calc_control_points)
-	(direction . ,Slur::calc_direction)
-	(springs-and-rods . ,Spanner::set_spacing_rods)
-	(Y-extent . ,Slur::height)
-	(stencil . ,Slur::print)
+	(control-points . ,ly:slur::calc-control-points)
+	(direction . ,ly:slur::calc-direction)
+	(springs-and-rods . ,ly:spanner::set-spacing-rods)
+	(Y-extent . ,ly:slur::height)
+	(stencil . ,ly:slur::print)
 	
 	(thickness . 1.0)
 	(minimum-length . 1.5)
-					; Slur::height)
+					; ly:slur::height)
 	(height-limit . 2.0)
 	(ratio . 0.25)
 	(meta . ((class . Spanner)
@@ -1366,7 +1366,7 @@
     (SpacingSpanner
      . (
 
-	(springs-and-rods . ,Spacing_spanner::set_springs)
+	(springs-and-rods . ,ly:spacing-spanner::set-springs)
 	(average-spacing-wishes . #t)
 	(grace-space-factor . 0.6)
 	(shortest-duration-space . 2.0)
@@ -1383,11 +1383,11 @@
 	(layer . 0)
 	(breakable . #t)
 
-	(stencil . ,Span_bar::print)
-	(bar-size . ,Span_bar::calc_bar_size)
-	(X-extent . ,Span_bar::width)
-	(glyph-name . ,Span_bar::calc_glyph_name)
-	(before-line-breaking . ,Span_bar::before_line_breaking)
+	(stencil . ,ly:span-bar::print)
+	(bar-size . ,ly:span-bar::calc-bar-size)
+	(X-extent . ,ly:span-bar::width)
+	(glyph-name . ,ly:span-bar::calc-glyph-name)
+	(before-line-breaking . ,ly:span-bar::before-line-breaking)
 
 	;; ugh duplication!
 
@@ -1405,11 +1405,11 @@
 
     (StanzaNumber
      . (
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(font-series . bold)
 	(padding . 1.0)
-	(X-offset . ,Side_position_interface::x_aligned_side)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(side-axis . ,X)
 	(direction . ,LEFT)
 	(meta . ((class . Item)
@@ -1450,10 +1450,10 @@
     (SostenutoPedal
      . (
 
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 
 	(direction . ,RIGHT)
-	(X-offset . ,Self_alignment_interface::x_aligned_on_self)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(no-spacing-rods . #t)
 	(padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
 	(font-shape . italic)
@@ -1467,9 +1467,9 @@
      . (
 	(axes . (1))
 
-	(X-extent . ,Axis_group_interface::height)
+	(X-extent . ,ly:axis-group-interface::height)
 
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 
 	(padding . 1.2)
@@ -1482,8 +1482,8 @@
 
     (StaffSymbol
      . (
-	(Y-extent . ,Staff_symbol::height)
-	(stencil . ,Staff_symbol::print)
+	(Y-extent . ,ly:staff-symbol::height)
+	(stencil . ,ly:staff-symbol::print)
 	(line-count . 5)
 	(ledger-line-thickness . (1.0 . 0.1))
 	(layer . 0)
@@ -1492,15 +1492,15 @@
 
     (Stem
      . (
-	(direction . ,Stem::calc_direction)
-	(default-direction . ,Stem::calc_default_direction)
-	(stem-end-position . ,Stem::calc_stem_end_position)
-	(stem-info . ,Stem::calc_stem_info)
-	(positioning-done . ,Stem::calc_positioning_done)
-	(stencil . ,Stem::print)
-	(X-extent . ,Stem::width)
-	(Y-extent . ,Stem::height)
-	(length . ,Stem::calc_length)
+	(direction . ,ly:stem::calc-direction)
+	(default-direction . ,ly:stem::calc-default-direction)
+	(stem-end-position . ,ly:stem::calc-stem-end-position)
+	(stem-info . ,ly:stem::calc-stem-info)
+	(positioning-done . ,ly:stem::calc-positioning-done)
+	(stencil . ,ly:stem::print)
+	(X-extent . ,ly:stem::width)
+	(Y-extent . ,ly:stem::height)
+	(length . ,ly:stem::calc-length)
 	
 	(thickness . 1.3)
 
@@ -1539,16 +1539,16 @@
 	;; We use the normal minima as minimum for the ideal lengths,
 	;; and the extreme minima as abolute minimum length.
 
-	(X-offset . ,Stem::offset_callback)
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(X-offset . ,ly:stem::offset-callback)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(meta . ((class . Item)
 		 (interfaces . (stem-interface
 				font-interface))))))
 
     (StemTremolo
      . (
-	(Y-extent . ,Stem_tremolo::height)
-	(stencil . ,Stem_tremolo::print)
+	(Y-extent . ,ly:stem-tremolo::height)
+	(stencil . ,ly:stem-tremolo::print)
 	(X-extent . #f)
 	(beam-width . 1.6) ; staff-space
 	(beam-thickness . 0.48) ; staff-space
@@ -1558,11 +1558,11 @@
     (SustainPedal
      . (
 	(no-spacing-rods . #t)
-	(stencil . ,Sustain_pedal::print)
+	(stencil . ,ly:sustain-pedal::print)
 	(self-alignment-X . 0)
 	(direction . ,RIGHT)
 	(padding . 0.0)  ;; padding relative to SustainPedalLineSpanner
-	(X-offset . ,Self_alignment_interface::x_aligned_on_self)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (piano-pedal-interface
 				text-spanner-interface
@@ -1573,8 +1573,8 @@
     (SustainPedalLineSpanner
      . (
 	(axes . (1))
-	(X-extent . ,Axis_group_interface::height)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(X-extent . ,ly:axis-group-interface::height)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(padding . 1.2)
 	(staff-padding . 1.2)
@@ -1588,8 +1588,8 @@
     (System
      . (
 	(axes . (0 1))
-	(X-extent . ,Axis_group_interface::width)
-	(Y-extent . ,Axis_group_interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
+	(Y-extent . ,ly:axis-group-interface::height)
 	(meta . ((class . System)
 		 (interfaces . (system-interface
 				axis-group-interface))))))
@@ -1598,9 +1598,9 @@
      . (
 	(style . brace)
 	(padding . 0.3)
-	(stencil . ,System_start_delimiter::print)
+	(stencil . ,ly:system-start-delimiter::print)
 	(collapse-height . 5.0)
-	(X-offset . ,Side_position_interface::x_aligned_side)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
 	(font-encoding . fetaBraces)
 	(Y-extent . #f)
@@ -1612,9 +1612,9 @@
     (SystemStartSquare
      . (
 	(Y-extent . #f)
-	(X-offset . ,Side_position_interface::x_aligned_side)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
-	(stencil . ,System_start_delimiter::print)
+	(stencil . ,ly:system-start-delimiter::print)
 	(style . line-bracket)
 	(thickness . 1.0)
 	(meta . ((class . Spanner)
@@ -1625,9 +1625,9 @@
      . (
 	(Y-extent . #f)
 	(padding . 0.8)
-	(X-offset . ,Side_position_interface::x_aligned_side)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
-	(stencil . ,System_start_delimiter::print)
+	(stencil . ,ly:system-start-delimiter::print)
 	(style . bracket)
 	(collapse-height . 5.0)
 	(thickness . 0.45)
@@ -1640,11 +1640,11 @@
      . (
 	(Y-extent . #f)
 	(padding . 0.0)
-	(X-offset . ,Side_position_interface::x_aligned_side)
+	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
 	(style . bar-line)
 	(thickness . 1.6)
-	(stencil . ,System_start_delimiter::print)
+	(stencil . ,ly:system-start-delimiter::print)
 	(meta . ((class . Spanner)
 		 (interfaces . (side-position-interface
 				system-start-delimiter-interface))))))
@@ -1653,8 +1653,8 @@
     (TabNoteHead
      . (
 
-	(stencil . ,Text_interface::print)
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(stencil . ,ly:text-interface::print)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(font-size . -2)
 	(stem-attachment . (1.0 . 1.35))
 	(font-series . bold)
@@ -1669,15 +1669,15 @@
     (TextScript
      . (
 	(no-spacing-rods . #t)
-	(X-offset . ,Self_alignment_interface::x_aligned_on_self)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(direction . ,DOWN)
 
 	;; sync with Fingering ?
 	(padding . 0.5)
 	(staff-padding . 0.5)
 
-	(stencil . ,Text_interface::print)
-	(direction . ,Script_interface::calc_direction)
+	(stencil . ,ly:text-interface::print)
+	(direction . ,ly:script-interface::calc-direction)
 
 	(avoid-slur . around)
 	(slur-padding . 0.5)
@@ -1691,8 +1691,8 @@
 
     (TextSpanner
      . (
-	(stencil . ,Text_spanner::print)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(stencil . ,ly:text-spanner::print)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(font-shape . italic)
 	(style . dashed-line)
 	(staff-padding . 0.8)
@@ -1707,10 +1707,10 @@
 
     (Tie
      . (
-	(control-points . ,Tie::calc_control_points)
+	(control-points . ,ly:tie::calc-control-points)
 	(avoid-slur . inside)
-	(direction . ,Tie::calc_direction)
-	(stencil . ,Tie::print)
+	(direction . ,ly:tie::calc-direction)
+	(stencil . ,ly:tie::print)
 	(details . (
 		    ;; for a full list, see tie-helper.cc
 		    (ratio . 0.333)
@@ -1733,8 +1733,8 @@
 
     (TieColumn
      . (
-	(positioning-done . ,Tie_column::calc_positioning_done)
-	(before-line-breaking . ,Tie_column::before_line_breaking)
+	(positioning-done . ,ly:tie-column::calc-positioning-done)
+	(before-line-breaking . ,ly:tie-column::before-line-breaking)
 	(X-extent . #f)
 	(Y-extent . #f)
 	(meta . ((class . Spanner)
@@ -1742,7 +1742,7 @@
 
     (TimeSignature
      . (
-	(stencil . ,Time_signature::print)
+	(stencil . ,ly:time-signature::print)
 	(break-align-symbol . time-signature)
 	(break-visibility . ,all-visible)
 	(space-alist . (
@@ -1758,14 +1758,14 @@
 
     (TrillSpanner
      . (
-	(stencil . ,Dynamic_text_spanner::print)
+	(stencil . ,ly:dynamic-text-spanner::print)
 	(edge-text . ,(cons (make-musicglyph-markup "scripts.trill")
 			    ""))
 	(style . trill)
 	(staff-padding . 1.0)
 	(padding . 0.5)
 	(direction . ,UP)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(meta . ((class . Spanner)
 		 (interfaces . (text-spanner-interface
@@ -1773,12 +1773,12 @@
 				font-interface))))))
 
     (TrillPitchAccidental
-     . ((X-offset . ,Side_position_interface::x_aligned_side)
+     . ((X-offset . ,ly:side-position-interface::x-aligned-side)
 	(padding . 0.2)
 	(direction . ,LEFT)
 	(font-size . -4)
 	(side-axis . ,X)
-	(stencil . ,Accidental_interface::print)
+	(stencil . ,ly:accidental-interface::print)
 	(meta . ((class . Item)
 		 (interfaces . (item-interface
 				accidental-interface
@@ -1786,7 +1786,7 @@
 				font-interface))))))
 
     (TrillPitchGroup
-     . ((X-offset . ,Side_position_interface::x_aligned_side)
+     . ((X-offset . ,ly:side-position-interface::x-aligned-side)
 	(axes . (,X))
 	(font-size . -4)
 	(stencil . ,parenthesize-elements)
@@ -1803,9 +1803,9 @@
 
     (TrillPitchHead
      . (
-	(stencil . ,Note_head::print)
+	(stencil . ,ly:note-head::print)
 	(duration-log . 2)
-	(Y-offset . ,Staff_symbol_referencer::callback)
+	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(font-size . -4)
 	(meta . ((class . Item)
 		 (interfaces . (item-interface
@@ -1823,11 +1823,11 @@
 	(shorten-pair . (-0.2 . -0.2))
 	(staff-padding . 0.25)
 	
-	(direction  . ,Tuplet_bracket::calc_direction)
-	(positions . ,Tuplet_bracket::calc_positions)
-	(connect-to-neighbor . ,Tuplet_bracket::calc_connect_to_neighbors)
-	(control-points . ,Tuplet_bracket::calc_control_points)
-	(stencil . ,Tuplet_bracket::print)
+	(direction  . ,ly:tuplet-bracket::calc-direction)
+	(positions . ,ly:tuplet-bracket::calc-positions)
+	(connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
+	(control-points . ,ly:tuplet-bracket::calc-control-points)
+	(stencil . ,ly:tuplet-bracket::print)
 	
 	(meta . ((class . Spanner)
 		 (interfaces . (line-interface
@@ -1835,7 +1835,7 @@
 
     (TupletNumber
      . (
-	(stencil . ,Tuplet_number::print)
+	(stencil . ,ly:tuplet-number::print)
 	(font-shape . italic)
 	(font-size . -2)
 	(avoid-slur . inside)
@@ -1845,13 +1845,13 @@
     
     (UnaCordaPedal
      . (
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 	(font-shape . italic)
 	(no-spacing-rods . #t)
 	(self-alignment-X . 0)
 	(direction . ,RIGHT)
 	(padding . 0.0)  ;; padding relative to UnaCordaPedalLineSpanner
-	(X-offset . ,Self_alignment_interface::x_aligned_on_self)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				self-alignment-interface
@@ -1860,8 +1860,8 @@
     (UnaCordaPedalLineSpanner
      . (
 	(axes . (1))
-	(X-extent . ,Axis_group_interface::height)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(X-extent . ,ly:axis-group-interface::height)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(padding . 1.2)
 	(staff-padding . 1.2)
@@ -1876,7 +1876,7 @@
      . (
 	(thickness . 0.6)
 	(flexa-width . 2.0)
-	(stencil . ,Vaticana_ligature::print)
+	(stencil . ,ly:vaticana-ligature::print)
 	(meta . ((class . Spanner)
 		 (interfaces . (vaticana-ligature-interface
 				font-interface))))))
@@ -1884,10 +1884,10 @@
     (VerticalAlignment
      . (
 	(axes . (1))
-	(positioning-done . ,Align_interface::calc_positioning_done)
-	(after-line-breaking . ,Align_interface::stretch_after_break)
-	(Y-extent . ,Axis_group_interface::height)
-	(X-extent . ,Axis_group_interface::width)
+	(positioning-done . ,ly:align-interface::calc-positioning-done)
+	(after-line-breaking . ,ly:align-interface::stretch-after-break)
+	(Y-extent . ,ly:axis-group-interface::height)
+	(X-extent . ,ly:axis-group-interface::width)
 	(stacking-dir . -1)
 	(meta . ((class . Spanner)
 		 (interfaces . (align-interface
@@ -1895,9 +1895,9 @@
     (VerticalAxisGroup
      . (
 	(axes . (1))
-	(Y-offset . ,Hara_kiri_group_spanner::force_hara_kiri_callback)
-	(Y-extent . ,Hara_kiri_group_spanner::y_extent)
-	(X-extent . ,Axis_group_interface::width)
+	(Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
+	(Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
+	(X-extent . ,ly:axis-group-interface::width)
 	(meta . ((class . Spanner)
 		 (interfaces . (axis-group-interface
 				hara-kiri-group-interface
@@ -1906,11 +1906,11 @@
     (VocalName
      . (
 	(breakable . #t)
-	(Y-offset . ,Side_position_interface::y_aligned_on_support_refpoints)
+	(Y-offset . ,ly:side-position-interface::y-aligned-on-support-refpoints)
 	(direction . ,CENTER)
 	(space-alist . ((left-edge . (extra-space . 1.0))))
 	(break-align-symbol . instrument-name)
-	(stencil . ,Text_interface::print)
+	(stencil . ,ly:text-interface::print)
 	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
 	(baseline-skip . 2)
@@ -1924,12 +1924,12 @@
 
     (VoltaBracket
      . (
-	(stencil . ,Volta_bracket_interface::print)
-	(after-line-breaking . ,Volta_bracket_interface::after_line_breaking)
+	(stencil . ,ly:volta-bracket-interface::print)
+	(after-line-breaking . ,ly:volta-bracket-interface::after-line-breaking)
 	(direction . ,UP)
 	(padding . 1)
 	(font-encoding . fetaNumber)
-	(Y-offset . ,Side_position_interface::y_aligned_side)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(thickness . 1.6)  ;;  linethickness
 	(edge-height . (2.0 . 2.0)) ;; staffspace;
@@ -1952,8 +1952,8 @@
 	(breakable . #t)
 	(X-extent . #f)
 	(Y-extent . #f)
-	(stencil . ,Line_spanner::print)
-	(after-line-breaking . ,Line_spanner::after_line_breaking)
+	(stencil . ,ly:line-spanner::print)
+	(after-line-breaking . ,ly:line-spanner::after-line-breaking)
 	(meta . ((class . Spanner)
 		 (interfaces . (line-spanner-interface
 				line-interface))))
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 8d327c0034..7eb2dff7cb 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -146,7 +146,7 @@ thickness and padding around the markup."
 ;;FIXME: is this working? 
 (def-markup-command (strut layout props) ()
   "Create a box of the same height as the space in the current font."
-  (let ((m (Text_interface::interpret_markup layout props " ")))
+  (let ((m (ly:text-interface::interpret-markup layout props " ")))
     (ly:make-stencil (ly:stencil-expr m)
 		     '(1000 . -1000)
 		     (ly:stencil-extent m X)
@@ -993,13 +993,13 @@ letter 'A'."
 (def-markup-command (markletter layout props num) (integer?)
   "Make a markup letter for @var{num}.  The letters start with A to Z
  (skipping I), and continues with double letters."
-  (Text_interface::interpret_markup layout props
+  (ly:text-interface::interpret-markup layout props
     (number->markletter-string number->mark-letter-vector num)))
 
 (def-markup-command (markalphabet layout props num) (integer?)
    "Make a markup letter for @var{num}.  The letters start with A to Z
  and continues with double letters."
-   (Text_interface::interpret_markup layout props
+   (ly:text-interface::interpret-markup layout props
      (number->markletter-string number->mark-alphabet-vector num)))
 
 
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 923fe97ad7..26354377f4 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -21,7 +21,7 @@ where x is one of \\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.")
      . (
 	(description . "Call the argument with the current context during interpreting phase")
 	(types . (general-music apply-context))
-	(iterator-ctor . ,Apply_context_iterator::constructor)
+	(iterator-ctor . ,ly:apply-context-iterator::constructor)
 	))
     (ApplyOutputEvent
      . (
@@ -36,7 +36,7 @@ arguments to func are 1. the grob, 2. the originating context,
 3. context where FUNC is called.
 
 ")
-	(iterator-ctor . ,Output_property_music_iterator::constructor)
+	(iterator-ctor . ,ly:output-property-music-iterator::constructor)
 	(types . (general-music layout-instruction))
 	))
     (ArpeggioEvent 
@@ -65,9 +65,9 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
     (AutoChangeMusic
      . (
 	(description .	"Used for making voices that switch between piano staves automatically.")
-	(iterator-ctor . ,Auto_change_iterator::constructor)
-	(start-callback . ,Music_wrapper::start_callback)
-	(length-callback . ,Music_wrapper::length_callback)
+	(iterator-ctor . ,ly:auto-change-iterator::constructor)
+	(start-callback . ,ly:music-wrapper::start-callback)
+	(length-callback . ,ly:music-wrapper::length-callback)
 	(types . (general-music music-wrapper-music auto-change-instruction))
 	))
     (BarCheck
@@ -75,7 +75,7 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 	(description .
 		     "Check whether this music coincides with the start of the measure.")
 	(types . (general-music bar-check))
-	(iterator-ctor . ,Bar_check_iterator::constructor)
+	(iterator-ctor . ,ly:bar-check-iterator::constructor)
 	))
     (BassFigureEvent
      . (
@@ -117,7 +117,7 @@ Syntax:
 	(description .	"Change staffs in Piano staff. 
 
 Syntax @code{\\translator Staff = @var{new-id}}.")
-	(iterator-ctor . , Change_iterator::constructor)
+	(iterator-ctor . , ly:change-iterator::constructor)
 	(types . (general-music translator-change-instruction))
 	))
 
@@ -132,9 +132,9 @@ Syntax @code{\\translator Staff = @var{new-id}}.")
     (ContextSpeccedMusic
      . (
 	(description .	"Interpret the argument music within a specific context.")
-	(iterator-ctor . ,Context_specced_music_iterator::constructor)
-	(length-callback . ,Music_wrapper::length_callback)
-	(start-callback . ,Music_wrapper::start_callback)
+	(iterator-ctor . ,ly:context-specced-music-iterator::constructor)
+	(length-callback . ,ly:music-wrapper::length-callback)
+	(start-callback . ,ly:music-wrapper::start-callback)
 	(types . (context-specification general-music music-wrapper-music))
 	))
     
@@ -166,9 +166,9 @@ Syntax: @var{note}\\cr
     (EventChord
      . (
 	(description .	"Internally used to group a set of events.")
-	(iterator-ctor . ,Event_chord_iterator::constructor)
-	(length-callback . ,Music_sequence::maximum_length_callback)
-	(to-relative-callback . ,Music_sequence::event_chord_relative_callback)
+	(iterator-ctor . ,ly:event-chord-iterator::constructor)
+	(length-callback . ,ly:music-sequence::maximum-length-callback)
+	(to-relative-callback . ,ly:music-sequence::event-chord-relative-callback)
 	(types . (general-music event-chord simultaneous-music))
 	))
 
@@ -191,9 +191,9 @@ Syntax: @var{note}\\cr
     (GraceMusic
      . (
 	(description .	"Interpret the argument as grace notes. ")
-	(start-callback . ,Grace_music::start_callback)
+	(start-callback . ,ly:grace-music::start-callback)
 	(length . ,ZERO-MOMENT)
-	(iterator-ctor . ,Grace_iterator::constructor)
+	(iterator-ctor . ,ly:grace-iterator::constructor)
 	(types . (grace-music music-wrapper-music general-music))
 	))
     (NoteGroupingEvent
@@ -243,9 +243,9 @@ Syntax: @var{note}\\laissezVibrer.")
 Syntax @var{\\oldaddlyrics }@var{music} @var{lyrics}.")
 
 	(types . (general-music lyric-combine-music))
-	(length-callback . ,Lyric_combine_music::length_callback)
-	(start-callback . ,Music_sequence::first_start_callback)
-	(iterator-ctor . ,Old_lyric_combine_music_iterator::constructor)
+	(length-callback . ,ly:lyric-combine-music::length-callback)
+	(start-callback . ,ly:music-sequence::first-start-callback)
+	(iterator-ctor . ,ly:old-lyric-combine-music-iterator::constructor)
 	))
     
     (LyricCombineMusic
@@ -255,7 +255,7 @@ Syntax @var{\\oldaddlyrics }@var{music} @var{lyrics}.")
 Syntax @var{\\lyricsto }@var{voicename} @var{lyrics}.")
 	(length . ,ZERO-MOMENT)
 	(types . (general-music lyric-combine-music))
-	(iterator-ctor . ,Lyric_combine_music_iterator::constructor)
+	(iterator-ctor . ,ly:lyric-combine-music-iterator::constructor)
 	))
 
     (LyricEvent
@@ -302,9 +302,9 @@ Syntax
 to group start-mmrest, skip, stop-mmrest sequence. 
 
 Syntax @code{R2.*5} for 5 measures in 3/4 time.")
-	(length-callback . ,Music_sequence::cumulative_length_callback)
-	(start-callback . ,Music_sequence::first_start_callback)
-	(iterator-ctor . ,Sequential_music_iterator::constructor)
+	(length-callback . ,ly:music-sequence::cumulative-length-callback)
+	(start-callback . ,ly:music-sequence::first-start-callback)
+	(iterator-ctor . ,ly:sequential-music-iterator::constructor)
 	(types . (general-music sequential-music))
 	))
     
@@ -338,7 +338,7 @@ individually.
 Syntax @code{\\outputproperty @var{predicate} @var{prop}
 = @var{val}}.")
 
-	(iterator-ctor . ,Output_property_music_iterator::constructor)
+	(iterator-ctor . ,ly:output-property-music-iterator::constructor)
 	(types . (general-music layout-instruction))
 	))
     
@@ -351,16 +351,16 @@ SYNTAX
 @code{\\override [ @var{Ctxt} . ] @var{Obj} @var{prop} = @var{val}}
 ")
 	(types . (general-music layout-instruction))
-	(iterator-ctor . ,Push_property_iterator::constructor)
+	(iterator-ctor . ,ly:push-property-iterator::constructor)
 	))
     (PartCombineMusic
      . (
 	(description .	"Combine two parts on a staff, either merged or
 as separate voices.")
-	(length-callback . ,Music_sequence::maximum_length_callback)
-	(start-callback . ,Music_sequence::minimum_start_callback)
+	(length-callback . ,ly:music-sequence::maximum-length-callback)
+	(start-callback . ,ly:music-sequence::minimum-start-callback)
 	(types . (general-music part-combine-music))
-	(iterator-ctor . ,Part_combine_iterator::constructor)
+	(iterator-ctor . ,ly:part-combine-iterator::constructor)
 	))
     (PhrasingSlurEvent
      . (
@@ -376,7 +376,7 @@ Syntax NOTE \\(  and \\) NOTE")
 
 Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
 	(types . (layout-instruction general-music))
-	(iterator-ctor . ,Property_iterator::constructor)
+	(iterator-ctor . ,ly:property-iterator::constructor)
 	))
 
     (PropertyUnset
@@ -384,7 +384,7 @@ Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
 	(description .	"Remove the definition of a context @code{\\property}.")
 
 	(types . (layout-instruction general-music))
-	(iterator-ctor . ,Property_unset_iterator::constructor)
+	(iterator-ctor . ,ly:property-unset-iterator::constructor)
 	))
     
     (PesOrFlexaEvent
@@ -399,15 +399,15 @@ goes down).")
     (QuoteMusic
      . (
 	(description . "Quote preprocessed snippets of music. ")
-	(iterator-ctor . ,Quote_iterator::constructor)
-	(length-callback . ,Music_wrapper::length_callback)
-	(start-callback . ,Music_wrapper::start_callback)
+	(iterator-ctor . ,ly:quote-iterator::constructor)
+	(length-callback . ,ly:music-wrapper::length-callback)
+	(start-callback . ,ly:music-wrapper::start-callback)
 	(types . (general-music music-wrapper-music))
 	))
     
     (RelativeOctaveCheck
      . ((description . "Check if a pitch is in the correct octave.")
-	(to-relative-callback . ,Relative_octave_check::relative_callback)
+	(to-relative-callback . ,ly:relative-octave-check::relative-callback)
 	(types . (general-music relative-octave-check))
 	))
     
@@ -440,7 +440,7 @@ previously added property from a graphical object definition
  ")
 
 	(types . (general-music layout-instruction))
-	(iterator-ctor . ,	Pop_property_iterator::constructor)
+	(iterator-ctor . ,	ly:pop-property-iterator::constructor)
 	))
 
     (SequentialMusic
@@ -449,9 +449,9 @@ previously added property from a graphical object definition
 
 Syntax \\sequential @{..@} or simply @{..@} .")
 
-	(length-callback . ,Music_sequence::cumulative_length_callback)
-	(start-callback . ,Music_sequence::first_start_callback)
-	(iterator-ctor . ,Sequential_music_iterator::constructor)
+	(length-callback . ,ly:music-sequence::cumulative-length-callback)
+	(start-callback . ,ly:music-sequence::first-start-callback)
+	(iterator-ctor . ,ly:sequential-music-iterator::constructor)
 	(types . (general-music sequential-music))
 	))
 
@@ -478,12 +478,12 @@ Syntax \\sequential @{..@} or simply @{..@} .")
 
 SYNTAX
 
-@code{ \\simultaneous @{ .. @}} or < .. >.")
+@code{ \\simultaneous @{ .. @}} or << .. >>.")
 
-	(iterator-ctor . ,Simultaneous_music_iterator::constructor)
-	(start-callback . ,Music_sequence::minimum_start_callback)
-	(length-callback . ,Music_sequence::maximum_length_callback)
-	(to-relative-callback . ,Music_sequence::simultaneous_relative_callback)
+	(iterator-ctor . ,ly:simultaneous-music-iterator::constructor)
+	(start-callback . ,ly:music-sequence::minimum-start-callback)
+	(length-callback . ,ly:music-sequence::maximum-length-callback)
+	(to-relative-callback . ,ly:music-sequence::simultaneous-relative-callback)
 	
 	(types . (general-music simultaneous-music))
 	))
@@ -492,7 +492,8 @@ SYNTAX
      . (
 	(description . "Start or end slur. 
 
-Syntax NOTE(	 and )NOTE")
+Syntax NOTE(	 and NOTE) ")
+
 	(types . (general-music span-event event slur-event))
 	))
     
@@ -527,19 +528,19 @@ Syntax NOTE(	 and )NOTE")
 Syntax @code{\\times @var{fraction} @var{music}}, e.g.
 @code{\\times 2/3 @{ ... @}} for triplets.
  ")
-	(length-callback . ,Music_wrapper::length_callback)
-	(start-callback . ,Music_wrapper::start_callback)
-	(iterator-ctor . ,Time_scaled_music_iterator::constructor)
+	(length-callback . ,ly:music-wrapper::length-callback)
+	(start-callback . ,ly:music-wrapper::start-callback)
+	(iterator-ctor . ,ly:time-scaled-music-iterator::constructor)
 	(types . (time-scaled-music music-wrapper-music general-music))
 	))
     
     (TransposedMusic
      . (
 	(description .	"Music that has been transposed.")
-	(iterator-ctor . ,Music_wrapper_iterator::constructor)
-	(start-callback . ,Music_wrapper::start_callback)
-	(length-callback . ,Music_wrapper::length_callback)
-	(to-relative-callback . ,Relative_octave_music::no_relative_callback)
+	(iterator-ctor . ,ly:music-wrapper-iterator::constructor)
+	(start-callback . ,ly:music-wrapper::start-callback)
+	(length-callback . ,ly:music-wrapper::length-callback)
+	(to-relative-callback . ,ly:relative-octave-music::no-relative-callback)
 	(types . (music-wrapper-music general-music transposed-music))
 	))
 
@@ -547,19 +548,19 @@ Syntax @code{\\times @var{fraction} @var{music}}, e.g.
      . (
 	(description .	"Music that can not be converted from relative to absolute notation.
 For example, transposed music.")
-	(to-relative-callback . ,Relative_octave_music::no_relative_callback)
-	(iterator-ctor . ,Music_wrapper_iterator::constructor)
-	(length-callback . ,Music_wrapper::length_callback)
+	(to-relative-callback . ,ly:relative-octave-music::no-relative-callback)
+	(iterator-ctor . ,ly:music-wrapper-iterator::constructor)
+	(length-callback . ,ly:music-wrapper::length-callback)
 	(types . (music-wrapper-music general-music unrelativable-music))
 	))
 
     (RelativeOctaveMusic
      . (
 	(description .	"Music that was entered in relative octave notation.")
-	(to-relative-callback . ,Relative_octave_music::relative_callback)
-	(iterator-ctor . ,Music_wrapper_iterator::constructor)
-	(length-callback . ,Music_wrapper::length_callback)
-	(start-callback . ,Music_wrapper::start_callback)
+	(to-relative-callback . ,ly:relative-octave-music::relative-callback)
+	(iterator-ctor . ,ly:music-wrapper-iterator::constructor)
+	(length-callback . ,ly:music-wrapper::length-callback)
+	(start-callback . ,ly:music-wrapper::start-callback)
 	(types . (music-wrapper-music general-music relative-octave-music))
 	))
     (ScriptEvent
@@ -578,7 +579,7 @@ does not create staffs or voices implicitly.
 
 Syntax: @code{\\skip }@var{duration}.")
 	(length-callback . ,ly:music-duration-length)
-	(iterator-ctor . ,Simple_music_iterator::constructor)
+	(iterator-ctor . ,ly:simple-music-iterator::constructor)
 	(types . (general-music event rhythmic-event skip-event))
 	))
     
@@ -659,38 +660,38 @@ Syntax: @code{\\\\}")
 
     (VoltaRepeatedMusic
      . (
-	(iterator-ctor . ,Volta_repeat_iterator::constructor)
+	(iterator-ctor . ,ly:volta-repeat-iterator::constructor)
 	(description . "")
-	(start-callback .  ,Repeated_music::first_start)
-	(length-callback . ,Repeated_music::volta_music_length)
+	(start-callback .  ,ly:repeated-music::first-start)
+	(length-callback . ,ly:repeated-music::volta-music-length)
 	(types . (general-music repeated-music volta-repeated-music))
 	))
     
     (UnfoldedRepeatedMusic
      . (
-	(iterator-ctor . ,Unfolded_repeat_iterator::constructor)
+	(iterator-ctor . ,ly:unfolded-repeat-iterator::constructor)
 	(description .	"")
-	(start-callback .  ,Repeated_music::first_start)
+	(start-callback .  ,ly:repeated-music::first-start)
 	(types . (general-music repeated-music unfolded-repeated-music))
-	(length-callback . ,Repeated_music::unfolded_music_length)
+	(length-callback . ,ly:repeated-music::unfolded-music-length)
 	))
     (PercentRepeatedMusic
      . (
 	(description .	"Repeats encoded by percents.")
-	(iterator-ctor . ,Percent_repeat_iterator::constructor)
-	(start-callback .  ,Repeated_music::first_start)
-	(length-callback . ,Repeated_music::unfolded_music_length)
+	(iterator-ctor . ,ly:percent-repeat-iterator::constructor)
+	(start-callback .  ,ly:repeated-music::first-start)
+	(length-callback . ,ly:repeated-music::unfolded-music-length)
 	(types . (general-music repeated-music percent-repeated-music))
 	))
     
     (TremoloRepeatedMusic
      . (
-	(iterator-ctor . ,Chord_tremolo_iterator::constructor)
+	(iterator-ctor . ,ly:chord-tremolo-iterator::constructor)
 	(description .	"Repeated notes denoted by tremolo beams.")
-	(start-callback .  ,Repeated_music::first_start)
+	(start-callback .  ,ly:repeated-music::first-start)
 
 	;; the length of the repeat is handled by shifting the note logs
-	(length-callback . ,Repeated_music::folded_music_length)
+	(length-callback . ,ly:repeated-music::folded-music-length)
 	(types . (general-music repeated-music tremolo-repeated-music))
 	
 	))
@@ -698,9 +699,9 @@ Syntax: @code{\\\\}")
     (FoldedRepeatedMusic
      . (
 	(description .	"Repeats with alternatives placed in parallel. ")
-	(iterator-ctor	. ,Folded_repeat_iterator::constructor)
-	(start-callback .  ,Repeated_music::minimum_start)
-	(length-callback . ,Repeated_music::folded_music_length)
+	(iterator-ctor	. ,ly:folded-repeat-iterator::constructor)
+	(start-callback .  ,ly:repeated-music::minimum-start)
+	(length-callback . ,ly:repeated-music::folded-music-length)
 	(types . (general-music repeated-music folded-repeated-music))
 	))
     ))
diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm
index b1148c064e..a5a81ed75f 100644
--- a/scm/layout-beam.scm
+++ b/scm/layout-beam.scm
@@ -53,18 +53,18 @@
 
 
 (define-public (check-quant-callbacks l r)
-  (list Beam::calc_least_squares_positions
-	Beam::slope_damping
-	Beam::shift_region_to_valid
-	Beam::quanting
+  (list ly:beam::calc-least-squares-positions
+	ly:beam::slope-damping
+	ly:beam::shift-region-to-valid
+	ly:beam::quanting
 	(check-beam-quant l r)
 	))
 			
 
 (define-public (check-slope-callbacks comparison)
-  (list Beam::calc_least_squares_positions
-	Beam::slope_damping
-	Beam::shift_region_to_valid
-	Beam::quanting
+  (list ly:beam::calc-least-squares-positions
+	ly:beam::slope-damping
+	ly:beam::shift-region-to-valid
+	ly:beam::quanting
 	(check-beam-slope-sign comparison)	
 	))
diff --git a/scm/markup.scm b/scm/markup.scm
index 117d5bc818..fc9fa946a3 100644
--- a/scm/markup.scm
+++ b/scm/markup.scm
@@ -391,7 +391,7 @@ eg: ((italic) (raise 4) (bold)), maps the commands on each markup argument, eg:
       empty-markup))
 
 
-(define-public interpret-markup Text_interface::interpret_markup)
+(define-public interpret-markup ly:text-interface::interpret-markup)
 (define-public (prepend-alist-chain key val chain)
   (cons (acons key val (car chain)) (cdr chain)))
 
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index d3b5b2fda5..b0ff69a6db 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -841,7 +841,7 @@ if appropriate.
     (if (and (equal? nm object-name)
 	     (procedure? cb))
 	(begin
-	  (ly:grob-set-property! grob 'stencil  Balloon_interface::print)
+	  (ly:grob-set-property! grob 'stencil  ly:balloon-interface::print)
 	  (set! (ly:grob-property grob 'original-stencil) cb)
 	  (set! (ly:grob-property grob 'balloon-text) text)
 	  (set! (ly:grob-property grob 'balloon-text-offset) off)
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index ae5c6f7111..ee652b2533 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -80,7 +80,7 @@
 	 (layout (ly:grob-layout grob))
 	 (defs (ly:output-def-lookup layout 'text-font-defaults))
 	 (props (ly:grob-alist-chain grob defs))
-	 (circle (Text_interface::interpret_markup
+	 (circle (ly:text-interface::interpret-markup
 		  layout props (make-circle-markup text))))
     circle))
 
@@ -178,7 +178,7 @@ centered, X==1 is at the right, X == -1 is at the left."
 
 (define-public (first-bar-number-invisible barnum) (> barnum 1))
 
-;; See documentation of Item::visibility_lambda_
+;; See documentation of ly:item::visibility-lambda-
 (define-public begin-of-line-visible
   #(#f #f #t))
 (define-public end-of-line-visible
diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 54bdeb032d..b76b3bc2d5 100644
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -144,65 +144,65 @@
    ;;$defaultmidi
    ;;$defaultlayout
 
-   Accidental_interface::print
-   Ambitus::print
-   Arpeggio::print
-   Arpeggio::brew_chord_bracket
-   Bar_line::print
-   Breathing_sign::offset_callback
-   Clef::print
-   Cluster::print
-   Cluster_beacon::height
-   Custos::print
-   Dot_column::side_position
-   Dots::print
-   Hairpin::print
-   Hara_kiri_group_spanner::force_hara_kiri_callback
-   Hara_kiri_group_spanner::y_extent
-   Horizontal_bracket::print
-   Hyphen_spanner::print
-   Hyphen_spanner::set_spacing_rods
-   Key_signature_interface::print
-   Line_spanner::print
-   Lyric_extender::print
-   Measure_grouping::print
-   Mensural_ligature::brew_ligature_primitive
-   Mensural_ligature::print
-   Multi_measure_rest::percent
-   Multi_measure_rest::print
-   Multi_measure_rest::set_spacing_rods
-   Note_head::print
-   Note_head::brew_ez_stencil
-   Ottava_bracket::print
-   Paper_column::print
-   Percent_repeat_item_interface::beat_slash
-   Percent_repeat_item_interface::double_percent
-   Piano_pedal_bracket::print
-   Rest::print
-   Script_interface::print
-   Separating_group_spanner::set_spacing_rods
-   Slur::height
-   Slur::print
-   Spacing_spanner::set_springs
-   Span_bar::print
-   Spanner::set_spacing_rods
-   Staff_symbol::print
-   Staff_symbol_referencer::callback
-   Stem::height
-   Stem::offset_callback
-   Stem::print
-   Stem_tremolo::height
-   Stem_tremolo::print
-   Sustain_pedal::print
-   System_start_delimiter::print
-   Text_interface::print
-   Text_spanner::print
-   Tie::print
-   Time_signature::print
-   Tuplet_bracket::print
-   Vaticana_ligature::brew_ligature_primitive
-   Vaticana_ligature::print
-   Volta_bracket_interface::print
+   ly:accidental-interface::print
+   ly:ambitus::print
+   ly:arpeggio::print
+   ly:arpeggio::brew-chord-bracket
+   ly:bar-line::print
+   ly:breathing-sign::offset-callback
+   ly:clef::print
+   ly:cluster::print
+   ly:cluster-beacon::height
+   ly:custos::print
+   ly:dot-column::side-position
+   ly:dots::print
+   ly:hairpin::print
+   ly:hara-kiri-group-spanner::force-hara-kiri-callback
+   ly:hara-kiri-group-spanner::y-extent
+   ly:horizontal-bracket::print
+   ly:hyphen-spanner::print
+   ly:hyphen-spanner::set-spacing-rods
+   ly:key-signature-interface::print
+   ly:line-spanner::print
+   ly:lyric-extender::print
+   ly:measure-grouping::print
+   ly:mensural-ligature::brew-ligature-primitive
+   ly:mensural-ligature::print
+   ly:multi-measure-rest::percent
+   ly:multi-measure-rest::print
+   ly:multi-measure-rest::set-spacing-rods
+   ly:note-head::print
+;;   ly:note-head::brew-ez-stencil
+   ly:ottava-bracket::print
+   ly:paper-column::print
+   ly:percent-repeat-item-interface::beat-slash
+   ly:percent-repeat-item-interface::double-percent
+   ly:piano-pedal-bracket::print
+   ly:rest::print
+   ly:script-interface::print
+   ly:separating-group-spanner::set-spacing-rods
+   ly:slur::height
+   ly:slur::print
+   ly:spacing-spanner::set-springs
+   ly:span-bar::print
+   ly:spanner::set-spacing-rods
+   ly:staff-symbol::print
+   ly:staff-symbol-referencer::callback
+   ly:stem::height
+   ly:stem::offset-callback
+   ly:stem::print
+   ly:stem-tremolo::height
+   ly:stem-tremolo::print
+   ly:sustain-pedal::print
+   ly:system-start-delimiter::print
+   ly:text-interface::print
+   ly:text-spanner::print
+   ly:tie::print
+   ly:time-signature::print
+   ly:tuplet-bracket::print
+   ly:vaticana-ligature::brew-ligature-primitive
+   ly:vaticana-ligature::print
+   ly:volta-bracket-interface::print
    ))
 
 (define-public (make-safe-lilypond-module)
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 4d4850de1b..9c22d98fa8 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -175,7 +175,7 @@ def do_one_file (infile_name):
 			result = re.sub (lilypond_version_re_str,
 					 '\\' + newversion, result)
 		elif add_version:
-
+			result = newversion + '\n' + result
 			
 		error_file.write ('\n')