diff --git a/test/test_songbook/.gitignore b/test/test_book/.gitignore
similarity index 100%
rename from test/test_songbook/.gitignore
rename to test/test_book/.gitignore
diff --git a/test/test_songbook/__init__.py b/test/test_book/__init__.py
similarity index 100%
rename from test/test_songbook/__init__.py
rename to test/test_book/__init__.py
diff --git a/test/test_songbook/content.tex.control b/test/test_book/content.tex.control
similarity index 100%
rename from test/test_songbook/content.tex.control
rename to test/test_book/content.tex.control
diff --git a/test/test_songbook/content.yaml b/test/test_book/content.yaml
similarity index 100%
rename from test/test_songbook/content.yaml
rename to test/test_book/content.yaml
diff --git a/test/test_songbook/content_datadir/content/foo.tex b/test/test_book/content_datadir/content/foo.tex
similarity index 100%
rename from test/test_songbook/content_datadir/content/foo.tex
rename to test/test_book/content_datadir/content/foo.tex
diff --git a/test/test_songbook/content_datadir/content/inter.isg b/test/test_book/content_datadir/content/inter.isg
similarity index 100%
rename from test/test_songbook/content_datadir/content/inter.isg
rename to test/test_book/content_datadir/content/inter.isg
diff --git a/test/test_songbook/content_datadir/content/song.csg b/test/test_book/content_datadir/content/song.csg
similarity index 100%
rename from test/test_songbook/content_datadir/content/song.csg
rename to test/test_book/content_datadir/content/song.csg
diff --git a/test/test_songbook/content_datadir/content/song.tsg b/test/test_book/content_datadir/content/song.tsg
similarity index 100%
rename from test/test_songbook/content_datadir/content/song.tsg
rename to test/test_book/content_datadir/content/song.tsg
diff --git a/test/test_songbook/content_datadir/songs/include.sbc b/test/test_book/content_datadir/songs/include.sbc
similarity index 100%
rename from test/test_songbook/content_datadir/songs/include.sbc
rename to test/test_book/content_datadir/songs/include.sbc
diff --git a/test/test_songbook/content_datadir/songs/inter.isg b/test/test_book/content_datadir/songs/inter.isg
similarity index 100%
rename from test/test_songbook/content_datadir/songs/inter.isg
rename to test/test_book/content_datadir/songs/inter.isg
diff --git a/test/test_songbook/content_datadir/songs/song.csg b/test/test_book/content_datadir/songs/song.csg
similarity index 100%
rename from test/test_songbook/content_datadir/songs/song.csg
rename to test/test_book/content_datadir/songs/song.csg
diff --git a/test/test_songbook/content_datadir/songs/song.tsg b/test/test_book/content_datadir/songs/song.tsg
similarity index 100%
rename from test/test_songbook/content_datadir/songs/song.tsg
rename to test/test_book/content_datadir/songs/song.tsg
diff --git a/test/test_songbook/datadir.tex.control b/test/test_book/datadir.tex.control
similarity index 100%
rename from test/test_songbook/datadir.tex.control
rename to test/test_book/datadir.tex.control
diff --git a/test/test_songbook/datadir.yaml b/test/test_book/datadir.yaml
similarity index 100%
rename from test/test_songbook/datadir.yaml
rename to test/test_book/datadir.yaml
diff --git a/test/test_songbook/datadir_datadir/img/datadir.png b/test/test_book/datadir_datadir/img/datadir.png
similarity index 100%
rename from test/test_songbook/datadir_datadir/img/datadir.png
rename to test/test_book/datadir_datadir/img/datadir.png
diff --git a/test/test_songbook/datadir_datadir/scores/datadir.ly b/test/test_book/datadir_datadir/scores/datadir.ly
similarity index 100%
rename from test/test_songbook/datadir_datadir/scores/datadir.ly
rename to test/test_book/datadir_datadir/scores/datadir.ly
diff --git a/test/test_songbook/datadir_datadir/songs/datadir.csg b/test/test_book/datadir_datadir/songs/datadir.csg
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/datadir.csg
rename to test/test_book/datadir_datadir/songs/datadir.csg
diff --git a/test/test_songbook/datadir_datadir/songs/datadir.tsg b/test/test_book/datadir_datadir/songs/datadir.tsg
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/datadir.tsg
rename to test/test_book/datadir_datadir/songs/datadir.tsg
diff --git a/test/test_songbook/datadir_datadir/songs/datadir2.csg b/test/test_book/datadir_datadir/songs/datadir2.csg
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/datadir2.csg
rename to test/test_book/datadir_datadir/songs/datadir2.csg
diff --git a/test/test_songbook/datadir_datadir/songs/datadir2.sg b/test/test_book/datadir_datadir/songs/datadir2.sg
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/datadir2.sg
rename to test/test_book/datadir_datadir/songs/datadir2.sg
diff --git a/test/test_songbook/datadir_datadir/songs/relative.csg b/test/test_book/datadir_datadir/songs/relative.csg
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/relative.csg
rename to test/test_book/datadir_datadir/songs/relative.csg
diff --git a/test/test_songbook/datadir_datadir/songs/relative.ly b/test/test_book/datadir_datadir/songs/relative.ly
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/relative.ly
rename to test/test_book/datadir_datadir/songs/relative.ly
diff --git a/test/test_songbook/datadir_datadir/songs/relative.png b/test/test_book/datadir_datadir/songs/relative.png
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/relative.png
rename to test/test_book/datadir_datadir/songs/relative.png
diff --git a/test/test_songbook/datadir_datadir/songs/relative.tsg b/test/test_book/datadir_datadir/songs/relative.tsg
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/relative.tsg
rename to test/test_book/datadir_datadir/songs/relative.tsg
diff --git a/test/test_songbook/datadir_datadir/songs/subdir/subdir.csg b/test/test_book/datadir_datadir/songs/subdir/subdir.csg
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/subdir/subdir.csg
rename to test/test_book/datadir_datadir/songs/subdir/subdir.csg
diff --git a/test/test_songbook/datadir_datadir/songs/subdir/subdir.ly b/test/test_book/datadir_datadir/songs/subdir/subdir.ly
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/subdir/subdir.ly
rename to test/test_book/datadir_datadir/songs/subdir/subdir.ly
diff --git a/test/test_songbook/datadir_datadir/songs/subdir/subdir.png b/test/test_book/datadir_datadir/songs/subdir/subdir.png
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/subdir/subdir.png
rename to test/test_book/datadir_datadir/songs/subdir/subdir.png
diff --git a/test/test_songbook/datadir_datadir/songs/subdir/subdir.tsg b/test/test_book/datadir_datadir/songs/subdir/subdir.tsg
similarity index 100%
rename from test/test_songbook/datadir_datadir/songs/subdir/subdir.tsg
rename to test/test_book/datadir_datadir/songs/subdir/subdir.tsg
diff --git a/test/test_songbook/datadir_datadir2/img/datadir2.png b/test/test_book/datadir_datadir2/img/datadir2.png
similarity index 100%
rename from test/test_songbook/datadir_datadir2/img/datadir2.png
rename to test/test_book/datadir_datadir2/img/datadir2.png
diff --git a/test/test_songbook/datadir_datadir2/scores/datadir2.ly b/test/test_book/datadir_datadir2/scores/datadir2.ly
similarity index 100%
rename from test/test_songbook/datadir_datadir2/scores/datadir2.ly
rename to test/test_book/datadir_datadir2/scores/datadir2.ly
diff --git a/test/test_songbook/lang_default.tex.control b/test/test_book/lang_default.tex.control
similarity index 100%
rename from test/test_songbook/lang_default.tex.control
rename to test/test_book/lang_default.tex.control
diff --git a/test/test_songbook/lang_default.yaml b/test/test_book/lang_default.yaml
similarity index 100%
rename from test/test_songbook/lang_default.yaml
rename to test/test_book/lang_default.yaml
diff --git a/test/test_songbook/lang_en.tex.control b/test/test_book/lang_en.tex.control
similarity index 100%
rename from test/test_songbook/lang_en.tex.control
rename to test/test_book/lang_en.tex.control
diff --git a/test/test_songbook/lang_en.yaml b/test/test_book/lang_en.yaml
similarity index 100%
rename from test/test_songbook/lang_en.yaml
rename to test/test_book/lang_en.yaml
diff --git a/test/test_songbook/lang_fr.tex.control b/test/test_book/lang_fr.tex.control
similarity index 100%
rename from test/test_songbook/lang_fr.tex.control
rename to test/test_book/lang_fr.tex.control
diff --git a/test/test_songbook/lang_fr.yaml b/test/test_book/lang_fr.yaml
similarity index 100%
rename from test/test_songbook/lang_fr.yaml
rename to test/test_book/lang_fr.yaml
diff --git a/test/test_songbook/languages.tex.control b/test/test_book/languages.tex.control
similarity index 100%
rename from test/test_songbook/languages.tex.control
rename to test/test_book/languages.tex.control
diff --git a/test/test_songbook/languages.yaml b/test/test_book/languages.yaml
similarity index 100%
rename from test/test_songbook/languages.yaml
rename to test/test_book/languages.yaml
diff --git a/test/test_songbook/languages_datadir/songs/language.csg b/test/test_book/languages_datadir/songs/language.csg
similarity index 100%
rename from test/test_songbook/languages_datadir/songs/language.csg
rename to test/test_book/languages_datadir/songs/language.csg
diff --git a/test/test_songbook/languages_datadir/songs/language_location.csg b/test/test_book/languages_datadir/songs/language_location.csg
similarity index 100%
rename from test/test_songbook/languages_datadir/songs/language_location.csg
rename to test/test_book/languages_datadir/songs/language_location.csg
diff --git a/test/test_songbook/languages_datadir/songs/no_language.csg b/test/test_book/languages_datadir/songs/no_language.csg
similarity index 100%
rename from test/test_songbook/languages_datadir/songs/no_language.csg
rename to test/test_book/languages_datadir/songs/no_language.csg
diff --git a/test/test_songbook/languages_datadir/songs/wrong_language.csg b/test/test_book/languages_datadir/songs/wrong_language.csg
similarity index 100%
rename from test/test_songbook/languages_datadir/songs/wrong_language.csg
rename to test/test_book/languages_datadir/songs/wrong_language.csg
diff --git a/test/test_songbook/languages_datadir/songs/wrong_location.csg b/test/test_book/languages_datadir/songs/wrong_location.csg
similarity index 100%
rename from test/test_songbook/languages_datadir/songs/wrong_location.csg
rename to test/test_book/languages_datadir/songs/wrong_location.csg
diff --git a/test/test_songbook/onthefly/content.onthefly.tex.control b/test/test_book/onthefly/content.onthefly.tex.control
similarity index 100%
rename from test/test_songbook/onthefly/content.onthefly.tex.control
rename to test/test_book/onthefly/content.onthefly.tex.control
diff --git a/test/test_songbook/onthefly/content.onthefly.yaml b/test/test_book/onthefly/content.onthefly.yaml
similarity index 100%
rename from test/test_songbook/onthefly/content.onthefly.yaml
rename to test/test_book/onthefly/content.onthefly.yaml
diff --git a/test/test_songbook/syntax.tex.control b/test/test_book/syntax.tex.control
similarity index 100%
rename from test/test_songbook/syntax.tex.control
rename to test/test_book/syntax.tex.control
diff --git a/test/test_songbook/syntax.yaml b/test/test_book/syntax.yaml
similarity index 100%
rename from test/test_songbook/syntax.yaml
rename to test/test_book/syntax.yaml
diff --git a/test/test_songbook/syntax_datadir/songs/musicnote.csg b/test/test_book/syntax_datadir/songs/musicnote.csg
similarity index 100%
rename from test/test_songbook/syntax_datadir/songs/musicnote.csg
rename to test/test_book/syntax_datadir/songs/musicnote.csg
diff --git a/test/test_songbook/test_compilation.py b/test/test_book/test_compilation.py
similarity index 100%
rename from test/test_songbook/test_compilation.py
rename to test/test_book/test_compilation.py
diff --git a/test/test_songbook/unicode.tex.control b/test/test_book/unicode.tex.control
similarity index 100%
rename from test/test_songbook/unicode.tex.control
rename to test/test_book/unicode.tex.control
diff --git a/test/test_songbook/unicode.yaml b/test/test_book/unicode.yaml
similarity index 100%
rename from test/test_songbook/unicode.yaml
rename to test/test_book/unicode.yaml
diff --git a/test/test_songbook/unicode_datadir/songs/nonbreak.csg b/test/test_book/unicode_datadir/songs/nonbreak.csg
similarity index 100%
rename from test/test_songbook/unicode_datadir/songs/nonbreak.csg
rename to test/test_book/unicode_datadir/songs/nonbreak.csg