v5: renaming files & modules ao & AO (from dal & DAL)

* ao (abstract objects) shorter, also easily searched, higher sort location
  abstract as representation of & extraction of document objects
  (dal (document abstraction layer))

31 files changed, 194 insertions, 186 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 04412472..d132b705 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -30,15 +30,23 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.0.orig.tar.xz
   sisu_5.1.0.orig.tar.xz
   sisu_5.1.0-1.dsc
 
-* dal_doc_str, changes related to headings provided for document structure
+* ao_doc_str, changes related to headings provided for document structure
   without ocn, testing required
 
-* dal endnotes, removed a space that should no longer be necessary,
+* ao endnotes, removed a space that should no longer be necessary,
   testing required
 
 * minor code related to line breaks, various locations
 
-* xml sax file renamed xml_sax.rb (from xml.rb)
+* renaming of modules
+  * use AO instead of DAL
+
+* renaming of files
+  * ao*.rb instead of dal*.rb
+    ao (abstract objects) shorter, also easily searched, higher sort location
+    abstract as representation of & extraction of document objects
+    (dal (document abstraction layer))
+  * xml sax file renamed xml_sax.rb (from xml.rb)
 
 * xmlns xlink using xl
 
diff --git a/lib/sisu/v5/dal.rb b/lib/sisu/v5/ao.rb
index fb8a19ae..00484ff9 100644
--- a/lib/sisu/v5/dal.rb
+++ b/lib/sisu/v5/ao.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -60,26 +60,26 @@
    in subsequent processing
 
 =end
-module SiSU_DAL
+module SiSU_AO
   require_relative 'defaults'                           # defaults.rb
     include SiSU_Viz
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   require_relative 'param'                              # param.rb
     include SiSU_Param
-  require_relative 'dal_doc_objects'                    # dal_doc_objects.rb
-  require_relative 'dal_syntax'                         # dal_syntax.rb
-    include SiSU_DAL_Syntax
-  require_relative 'dal_doc_str'                        # dal_doc_str.rb
-  require_relative 'dal_idx'                            # dal_idx.rb
-  require_relative 'dal_numbering'                      # dal_numbering.rb
-  require_relative 'dal_hash_digest'                    # dal_hash_digest.rb
-  require_relative 'dal_endnotes'                       # dal_endnotes.rb
-  require_relative 'dal_images'                         # dal_images.rb
-  require_relative 'dal_metadata'                       # dal_metadata.rb
-  require_relative 'dal_character_check'                # dal_character_check.rb
-  require_relative 'dal_misc_arrange'                   # dal_misc_arrange.rb
-  require_relative 'dal_expand_insertions'              # dal_expand_insertions.rb
+  require_relative 'ao_doc_objects'                     # ao.rb
+  require_relative 'ao_syntax'                          # ao_syntax.rb
+    include SiSU_AO_Syntax
+  require_relative 'ao_doc_str'                         # ao_doc_str.rb
+  require_relative 'ao_idx'                             # ao_idx.rb
+  require_relative 'ao_numbering'                       # ao_numbering.rb
+  require_relative 'ao_hash_digest'                     # ao_hash_digest.rb
+  require_relative 'ao_endnotes'                        # ao_endnotes.rb
+  require_relative 'ao_images'                          # ao_images.rb
+  require_relative 'ao_metadata'                        # ao_metadata.rb
+  require_relative 'ao_character_check'                 # ao_character_check.rb
+  require_relative 'ao_misc_arrange'                    # ao_misc_arrange.rb
+  require_relative 'ao_expand_insertions'               # ao_expand_insertions.rb
   require_relative 'prog_text_translation'              # prog_text_translation.rb
   require_relative 'shared_sem'                         # shared_sem.rb
   class Instantiate < SiSU_Param::Parameters::Instructions
@@ -127,7 +127,7 @@ module SiSU_DAL
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
-        SiSU_DAL::Instantiate.new
+        SiSU_AO::Instantiate.new
       end
     end
     def get                                                                    #reads dal, unless does not exist then creates first
@@ -148,7 +148,7 @@ module SiSU_DAL
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
-        SiSU_DAL::Instantiate.new
+        SiSU_AO::Instantiate.new
       end
     end
     def get_idx_sst                                                            #reads dal idx.sst, #unless does not exist then creates first
@@ -167,7 +167,7 @@ module SiSU_DAL
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
-        SiSU_DAL::Instantiate.new
+        SiSU_AO::Instantiate.new
       end
     end
     def get_idx_raw
@@ -186,7 +186,7 @@ module SiSU_DAL
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
-        SiSU_DAL::Instantiate.new
+        SiSU_AO::Instantiate.new
       end
     end
     def get_idx_html                                                           #reads dal idx.html, #unless does not exist then creates first
@@ -205,7 +205,7 @@ module SiSU_DAL
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
-        SiSU_DAL::Instantiate.new
+        SiSU_AO::Instantiate.new
       end
     end
     def get_idx_xhtml                                                          #reads dal idx.xhtml, #unless does not exist then creates first
@@ -224,7 +224,7 @@ module SiSU_DAL
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
-        SiSU_DAL::Instantiate.new
+        SiSU_AO::Instantiate.new
       end
     end
     def get_map_nametags                                                       #reads dal map.nametags, #unless does not exist then creates first
@@ -243,7 +243,7 @@ module SiSU_DAL
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
-        SiSU_DAL::Instantiate.new
+        SiSU_AO::Instantiate.new
       end
     end
     def get_map_ocn_htmlseg                                                    #reads dal map.ocn_htmlseg, #unless does not exist then creates first
@@ -262,7 +262,7 @@ module SiSU_DAL
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
-        SiSU_DAL::Instantiate.new
+        SiSU_AO::Instantiate.new
       end
     end
   protected
@@ -285,7 +285,7 @@ module SiSU_DAL
       meta=file_array=@env.source_file_processing_array(fn)
       @md=SiSU_Param::Parameters::Instructions.new(meta,@opt).extract
       meta=nil
-      dal=SiSU_DAL::Make.new(fn,@md,file_array).song
+      dal=SiSU_AO::Make.new(fn,@md,file_array).song
       if (@opt.act[:verbose][:set]==:on \
       || @opt.act[:verbose_plus][:set]==:on \
       || @opt.act[:maintenance][:set]==:on)
@@ -323,13 +323,13 @@ module SiSU_DAL
       dal=[]
       dal=(FileTest.file?(@fnm)) \
       ? (File.open(@fnm,'r:utf-8'){ |f| dal=Marshal.load(f)})
-      : SiSU_DAL::Source.new(@opt).create_dal
+      : SiSU_AO::Source.new(@opt).create_dal
     end
     def read_fnc
       dal=[]
       dal=(FileTest.file?(@fnc)) \
       ? (File.open(@fnc,'r:utf-8'){ |f| dal=Marshal.load(f)})
-      : SiSU_DAL::Source.new(@opt).create_dal
+      : SiSU_AO::Source.new(@opt).create_dal
     end
     def read_idx_sst
       m=[]
@@ -505,28 +505,28 @@ module SiSU_DAL
     def song
       reset
       data=@data
-      data=SiSU_DAL_Insertions::Insertions.new(@md,data).expand_insertions?                                              # dal_expand_insertions.rb
-      data=SiSU_DAL_MiscArrangeText::SI.new(@md,data).prepare_text                                                       # dal_misc_arrange.rb
-      data,metadata=SiSU_DAL_DocumentStructureExtract::Build.new(@md,data).identify_parts                                # dal_doc_str.rb
-      data=SiSU_DAL_Syntax::Markup.new(@md,data).songsheet                                                               # dal_syntax.rb
-      data,endnote_array=SiSU_DAL_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array             # dal_character_check.rb
-      data=SiSU_DAL_Images::Images.new(@md,data).images                                                                  # dal_images.rb
-      data,tags_map,ocn_html_seg_map=SiSU_DAL_Numbering::Numbering.new(@md,data).numbering_song                          # dal_numbering.rb
-      data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_DAL_BookIndex::BookIndex.new(@md,data,@env).indexing_song if @md.book_idx  # dal_idx.rb
-      data=SiSU_DAL_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes                                              # dal_endnotes.rb
+      data=SiSU_AO_Insertions::Insertions.new(@md,data).expand_insertions?                                              # dal_expand_insertions.rb
+      data=SiSU_AO_MiscArrangeText::SI.new(@md,data).prepare_text                                                       # dal_misc_arrange.rb
+      data,metadata=SiSU_AO_DocumentStructureExtract::Build.new(@md,data).identify_parts                                # dal_doc_str.rb
+      data=SiSU_AO_Syntax::Markup.new(@md,data).songsheet                                                               # dal_syntax.rb
+      data,endnote_array=SiSU_AO_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array             # dal_character_check.rb
+      data=SiSU_AO_Images::Images.new(@md,data).images                                                                  # dal_images.rb
+      data,tags_map,ocn_html_seg_map=SiSU_AO_Numbering::Numbering.new(@md,data).numbering_song                          # dal_numbering.rb
+      data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_AO_BookIndex::BookIndex.new(@md,data,@env).indexing_song if @md.book_idx  # dal_idx.rb
+      data=SiSU_AO_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes                                              # dal_endnotes.rb
       outputdata=data
       if (@md.opt.act[:dal][:set]==:on \
       || @md.opt.act[:maintenance][:set]==:on)
-        SiSU_DAL::Output.new(@fn,@md,outputdata).hard_output
-        SiSU_DAL::Output.new(@fn,@md,outputdata).make_marshal_content
-        SiSU_DAL::Output.new(@fn,@md,metadata).make_marshal_metadata
-        SiSU_DAL::Output.new(@fn,@md,html_idx).idx_html_hard_output
-        SiSU_DAL::Output.new(@fn,@md,book_index_rel_html_seg).make_marshal_idx_sst_html_seg
-        SiSU_DAL::Output.new(@fn,@md,book_index_rel).make_marshal_idx_sst_rel
-        SiSU_DAL::Output.new(@fn,@md,html_idx).make_marshal_idx_html
-        SiSU_DAL::Output.new(@fn,@md,xhtml_idx).make_marshal_idx_xhtml
-        SiSU_DAL::Output.new(@fn,@md,tags_map).make_marshal_map_nametags
-        SiSU_DAL::Output.new(@fn,@md,ocn_html_seg_map).make_marshal_map_name_ocn_htmlseg
+        SiSU_AO::Output.new(@fn,@md,outputdata).hard_output
+        SiSU_AO::Output.new(@fn,@md,outputdata).make_marshal_content
+        SiSU_AO::Output.new(@fn,@md,metadata).make_marshal_metadata
+        SiSU_AO::Output.new(@fn,@md,html_idx).idx_html_hard_output
+        SiSU_AO::Output.new(@fn,@md,book_index_rel_html_seg).make_marshal_idx_sst_html_seg
+        SiSU_AO::Output.new(@fn,@md,book_index_rel).make_marshal_idx_sst_rel
+        SiSU_AO::Output.new(@fn,@md,html_idx).make_marshal_idx_html
+        SiSU_AO::Output.new(@fn,@md,xhtml_idx).make_marshal_idx_xhtml
+        SiSU_AO::Output.new(@fn,@md,tags_map).make_marshal_map_nametags
+        SiSU_AO::Output.new(@fn,@md,ocn_html_seg_map).make_marshal_map_name_ocn_htmlseg
       end
       reset
       outputdata
diff --git a/lib/sisu/v5/dal_character_check.rb b/lib/sisu/v5/ao_character_check.rb
index 62aa60c1..86f23f5b 100644
--- a/lib/sisu/v5/dal_character_check.rb
+++ b/lib/sisu/v5/ao_character_check.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_character_check.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_character_check.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_CharacterCheck
+module SiSU_AO_CharacterCheck
   class Check
     def initialize(data)
       @data=data
diff --git a/lib/sisu/v5/dal_doc_objects.rb b/lib/sisu/v5/ao_doc_objects.rb
index 518535b0..556304d4 100644
--- a/lib/sisu/v5/dal_doc_objects.rb
+++ b/lib/sisu/v5/ao_doc_objects.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_doc_objects.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_objects.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: document abstraction
 
 =end
-module SiSU_DAL_DocumentStructure
+module SiSU_AO_DocumentStructure
   class Extract
     def extract(h,o)
       h ? h : o
diff --git a/lib/sisu/v5/dal_doc_str.rb b/lib/sisu/v5/ao_doc_str.rb
index 7a89dfb1..465a5666 100644
--- a/lib/sisu/v5/dal_doc_str.rb
+++ b/lib/sisu/v5/ao_doc_str.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_doc_str.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_str.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: document abstraction
 
 =end
-module SiSU_DAL_DocumentStructureExtract
+module SiSU_AO_DocumentStructureExtract
   class Instantiate < SiSU_Param::Parameters::Instructions
     @@flag={
       ocn:      :on,
@@ -89,10 +89,10 @@ module SiSU_DAL_DocumentStructureExtract
     }
     def initialize(md,data)
       @md,@data=md,data
-      SiSU_DAL_DocumentStructureExtract::Instantiate.new
-      @pb=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
-      @pbn=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
-      @pbl=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line])
+      SiSU_AO_DocumentStructureExtract::Instantiate.new
+      @pb=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page])
+      @pbn=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new])
+      @pbl=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line])
     end
     def ln_get(lv)
       case lv
@@ -238,7 +238,7 @@ module SiSU_DAL_DocumentStructureExtract
             @@flag[:ocn]=:on
             {flag: :ocn_on}
           end
-          t_o=SiSU_DAL_DocumentStructure::ObjectFlag.new.flag_ocn(h)
+          t_o=SiSU_AO_DocumentStructure::ObjectFlag.new.flag_ocn(h)
           next
         end
         t_o=t_o.gsub(/(?:\n\s*\n)+/m,"\n") if @@flag[:code]==:off
@@ -271,7 +271,7 @@ module SiSU_DAL_DocumentStructureExtract
           when /^%+\s/                                     #comment
             t_o=if t_o=~/^%+\s+(.+)/
               h={obj: $1}
-              SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+              SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
             else nil
             end
           when /^:?([A-C1-6])\~/                           #heading / lv
@@ -292,7 +292,7 @@ module SiSU_DAL_DocumentStructureExtract
                 end
               end
               h={ lv: lv, ln: ln, obj: obj, idx: idx, tags: tags }
-              SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
+              SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
             elsif t_o=~/^:?[A-C1-6]\~(\S+?)-\s+(.+)/m
               name,obj=$1,$2
               note=endnote_test?(obj)
@@ -308,7 +308,7 @@ module SiSU_DAL_DocumentStructureExtract
                 end
               end
               h={ lv: lv, name: name, obj: obj, idx: idx, autonum_: false, tags: tags}
-              SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
+              SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
             elsif t_o=~/^:?[A-C1-6]\~(\S+)\s+(.+)/m
               name,obj=$1,$2
               note=endnote_test?(obj)
@@ -324,7 +324,7 @@ module SiSU_DAL_DocumentStructureExtract
                 end
               end
               h={ lv: lv, name: name, obj: obj, idx: idx, tags: tags }
-              SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
+              SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
             else nil
             end
           when /^_(?:[1-9]!?|[1-9]?\*)\s+/                  #indented and/or bullet paragraph
@@ -347,7 +347,7 @@ module SiSU_DAL_DocumentStructureExtract
                   end
                 end
                 h={ bullet_: bullet, hang: hang, indent: indent, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
-                SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
+                SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
               end
             else nil
             end
@@ -370,18 +370,18 @@ module SiSU_DAL_DocumentStructureExtract
                   end
                 end
                 h={ hang: hang, indent: indent, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
-                SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
+                SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
               end
             else nil
             end
           when /^<(?:br)?:(?:pa?r|o(?:bj|---)?)>\s*$/      #[br:par] #[br:obj]
-            SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_obj])
+            SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_obj])
           when /^(?:-\\\\-|<:pb>)\s*$/                                #[br:pg]
-            SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page],:markup)
+            SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page],:markup)
           when /^(?:=\\\\=|<:pn>)\s*$/                                #[br:pgn]
-            SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new],:markup)
+            SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new],:markup)
           when /^-\.\.-\s*$/                                          #[br:pgl]
-            SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line],:markup)
+            SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line],:markup)
           else                                             #paragraph
             image=image_test(t_o)
             note=endnote_test?(t_o)
@@ -394,7 +394,7 @@ module SiSU_DAL_DocumentStructureExtract
             end
             unless obj=~/\A\s*\Z/m
               h={ bullet_: false, indent: 0, hang: 0, obj: obj, idx: idx, note_: note, image_: image, tags: tags }
-              SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
+              SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
             end
           end
         elsif @@flag[:code]==:off
@@ -407,7 +407,7 @@ module SiSU_DAL_DocumentStructureExtract
             @@counter=1
             @codeblock_numbered=(t_o =~/^(?:code\{#|[`]{3}\s+code\s[#])/) ? true : false
             h={ obj: 'code block start' }                   #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
           elsif t_o =~/^(?:poem\{|[`]{3}\s+poem)/
             @@flag[:poem]=case t_o
             when /^poem\{/;        :curls
@@ -415,7 +415,7 @@ module SiSU_DAL_DocumentStructureExtract
             else                   @@flag[:poem] #error
             end
             h={ obj: 'poem start' }                         #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
             tuned_file << t_o
           elsif t_o =~/^(?:group\{|[`]{3}\s+group)/
             @@flag[:group]=case t_o
@@ -424,7 +424,7 @@ module SiSU_DAL_DocumentStructureExtract
             else                    @@flag[:group] #error
             end
             h={ obj: 'group text start' }                   #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
             tuned_file << t_o
           elsif t_o =~/^(?:block\{|[`]{3}\s+block)/
             @@flag[:block]=case t_o
@@ -433,7 +433,7 @@ module SiSU_DAL_DocumentStructureExtract
             else                    @@flag[:block] #error
             end
             h={ obj: 'block text start' }                   #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
             tuned_file << t_o
           elsif t_o =~/^(?:alt\{|[`]{3}\s+alt)/
             @@flag[:alt]=case t_o
@@ -442,11 +442,11 @@ module SiSU_DAL_DocumentStructureExtract
             else                  @@flag[:alt] #error
             end
             h={ obj: 'alt text start' }                     #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
             tuned_file << t_o
           elsif t_o =~/^(?:table\{|[`]{3}\s+table|\{table)[ ~]/
             h={ obj: 'table start' }                        #introduce a counter
-            ins=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            ins=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
             tuned_file << ins
             if t_o=~/^table\{(?:~h)?\s+/
               @@flag[:table]=:curls
@@ -500,10 +500,10 @@ module SiSU_DAL_DocumentStructureExtract
                 cols.times { col << width }
               end
               h={ head_: hd, cols: cols, widths: col, obj: rows, idx: idx, tags: tags }
-              t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
+              t_o=SiSU_AO_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
               tuned_file << t_o
               h={ obj: 'table end' }                        #introduce a counter
-              t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+              t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
               t_o
             elsif t_o=~/^[`]{3}\s+table(?:~h)?\s+/
               m1,m2,hd=nil,nil,nil
@@ -523,10 +523,10 @@ module SiSU_DAL_DocumentStructureExtract
                 rows += r + Mx[:tc_c]
               end
               h={ head_: hd, cols: col.length, widths: col, obj: rows, idx: idx, tags: tags }
-              t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
+              t_o=SiSU_AO_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
               tuned_file << t_o
               h={ obj: 'table end' }                        #introduce a counter
-              t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+              t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
               t_o
             elsif t_o=~/^\{table(?:~h)?\s+/
               m1,m2,hd=nil,nil,nil
@@ -546,10 +546,10 @@ module SiSU_DAL_DocumentStructureExtract
                 rows += r + Mx[:tc_c]
               end
               h={ head_: hd, cols: col.length, widths: col, obj: rows, idx: idx, tags: tags }
-              t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
+              t_o=SiSU_AO_DocumentStructure::ObjectTable.new.table(h) unless h.nil?
               tuned_file << t_o
               h={ obj: 'table end' }                        #introduce a counter
-              t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+              t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
               t_o
             end
           end
@@ -563,11 +563,11 @@ module SiSU_DAL_DocumentStructureExtract
             @@flag[:table]=:off
             headings,columns,widths,idx=@h[:head_],@h[:cols],@h[:widths],@h[:idx]
             @h={ head_: headings, cols: columns, widths: widths, idx: idx, obj: @rows }
-            t_o=SiSU_DAL_DocumentStructure::ObjectTable.new.table(@h)
+            t_o=SiSU_AO_DocumentStructure::ObjectTable.new.table(@h)
             tuned_file << t_o
             @h,@rows=nil,''
             h={ obj: 'table end' }                          #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
             t_o
           else
             if t_o.is_a?(String) \
@@ -586,18 +586,18 @@ module SiSU_DAL_DocumentStructureExtract
             obj=@tuned_code.join("\n")
             tags=[]
             h={ obj: obj, tags: tags, number_: @codeblock_numbered }
-            t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.code(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectBlockTxt.new.code(h)
             @tuned_code=[]
             tuned_file << t_o
             h={ obj: 'code block end' }                     #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
           end
           if (@@flag[:code]==:curls or @@flag[:code]==:tics) \
           and t_o.is_a?(String)
             sub_array=t_o.dup + "#{Mx[:br_nl]}"
             @line_mode=[]
             sub_array.scan(/.+/) {|w| @line_mode << w if w =~/[\S]+/}
-            t_o=SiSU_DAL_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(:code).join
+            t_o=SiSU_AO_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(:code).join
             @tuned_code << t_o
             t_o=nil
           end
@@ -609,37 +609,37 @@ module SiSU_DAL_DocumentStructureExtract
           or (@@flag[:poem]==:tics and t_o =~/^[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
             @@flag[:poem]=:off
             h={ obj: 'poem end' }                           #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
           elsif (@@flag[:group]==:curls and t_o =~/^\}group/) \
           or (@@flag[:group]==:tics and t_o =~/^[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
             @@flag[:group]=:off
             obj,tags=extract_tags(@tuned_block.join("\n"))
             h={ obj: obj, tags: tags }
             @tuned_block=[]
-            t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.group(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectBlockTxt.new.group(h)
             tuned_file << t_o
             h={ obj: 'group text end' }                     #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
           elsif (@@flag[:block]==:curls and t_o =~/^\}block/) \
           or (@@flag[:block]==:tics and t_o =~/^[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
             @@flag[:block]=:off
             obj,tags=extract_tags(@tuned_block.join("\n"))
             h={ obj: obj, tags: tags }
             @tuned_block=[]
-            t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.block(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectBlockTxt.new.block(h)
             tuned_file << t_o
             h={ obj: 'block text end' }                     #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
           elsif (@@flag[:alt]==:curls and t_o =~/^\}alt/) \
           or (@@flag[:alt]==:tics and t_o =~/^[`]{3}(?:\s+[~-][#]|\s+\~\{.+?\}\~)?\s*$/)
             @@flag[:alt]=:off
             obj,tags=extract_tags(@tuned_block.join("\n"))
             h={ obj: obj, tags: tags }
-            t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.alt(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectBlockTxt.new.alt(h)
             @tuned_block=[]
             tuned_file << t_o
             h={ obj: 'alt text end' }                       #introduce a counter
-            t_o=SiSU_DAL_DocumentStructure::ObjectComment.new.comment(h)
+            t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
           end
           if (@@flag[:poem]==:curls or @@flag[:poem]==:tics \
           or @@flag[:group]==:curls or @@flag[:group]==:tics \
@@ -650,13 +650,13 @@ module SiSU_DAL_DocumentStructureExtract
             sub_array=t_o.dup
             @line_mode=sub_array.scan(/.+/)
             type=if @@flag[:poem]==:curls or @@flag[:poem]==:tics
-              t_o=SiSU_DAL_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(type).join
+              t_o=SiSU_AO_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(type).join
               poem=t_o.split(/\n\n/)
               poem.each do |v|
                 v=v.gsub(/\n/m,"#{Mx[:br_nl]}\n")
                 obj,tags=extract_tags(v)
                 h={ obj: obj, tags: tags }
-                t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.verse(h)
+                t_o=SiSU_AO_DocumentStructure::ObjectBlockTxt.new.verse(h)
                 tuned_file << t_o
               end
               :poem
@@ -691,26 +691,26 @@ module SiSU_DAL_DocumentStructureExtract
       if @md.flag_endnotes
         tuned_file << @pb
         h={ ln: 2, lc: 2, obj: 'Endnotes', autonum_: false }
-        tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
         h={ ln: 4, lc: 3, obj: 'Endnotes', name: 'endnotes', autonum_: false }
-        tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
         h={ obj: 'Endnotes' }
       end
       if @md.book_idx
         tuned_file << @pb
         h={ ln: 2, lc: 2, obj: 'Index', autonum_: false }
-        tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
         h={ ln: 4, lc: 3, obj: 'Index', name: 'book_index', autonum_: false }
-        tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
+        tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
         h={ obj: 'Index' }
       end
       tuned_file << @pb
       h={ ln: 2, lc: 2, obj: 'Metadata', autonum_: false, ocn_: false }
-      tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
+      tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
       h={ ln: 4, lc: 3, obj: 'SiSU Metadata, document information', name: 'metadata', autonum_: false, ocn_: false }
-      tuned_file << SiSU_DAL_DocumentStructure::ObjectHeading.new.heading_insert(h)
+      tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h)
       h={ obj: 'eof' }
-      meta=SiSU_DAL_DocumentStructure::ObjectMetadata.new.metadata(@metadata)
+      meta=SiSU_AO_DocumentStructure::ObjectMetadata.new.metadata(@metadata)
       [tuned_file,meta]
     end
     def table_rows_and_columns_array(table_str)
@@ -723,11 +723,11 @@ module SiSU_DAL_DocumentStructureExtract
     end
     def meta_heading(h)
       h={ lv: h[:lv], ln: h[:ln], name: h[:name], obj: h[:obj], ocn: '0' }
-      SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
+      SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
     end
     def meta_para(str)
       h={ obj: str, ocn_: false }
-      SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
+      SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
     end
     def build_lines(type=:none)
       lines,lines_new=@data,[]
@@ -769,22 +769,22 @@ module SiSU_DAL_DocumentStructureExtract
         @dob=case @dob.obj
         when /^#{@md.lv1}/
           h={ lv: 'A', ln: 1 }
-          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv2}/
           h={ lv: 'B', ln: 2 }
-          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv3}/
           h={ lv: 'C', ln: 3 }
-          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv4}/
           h={ lv: '1', ln: 4 }
-          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv5}/
           h={ lv: '2', ln: 5 }
-          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         when /^#{@md.lv6}/
           h={ lv: '3', ln: 6 }
-          SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,@dob)
+          SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h,@dob)
         else @dob
         end
       else @dob
@@ -1122,19 +1122,19 @@ or this level should be 5~ rather #{dob.lv}" #level 6
           dob.obj=dob.obj.gsub(/#{Mx[:pa_non_object_no_heading]}/,'')
           if dob.is==:para
             h={ obj: dob.obj, ocn_: false, ocn: nil, hang: dob.hang, indent: dob.indent, bullet_: dob.bullet_, tags: dob.tags, parent: dob.parent }
-            dob=SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h,dob)
+            dob=SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h,dob)
           elsif dob.is==:heading
             h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: true, parent: dob.parent }
-            dob=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,dob)
+            dob=SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h,dob)
           end
         elsif dob.obj=~/#{Mx[:pa_non_object_dummy_heading]}/
           dob.obj=dob.obj.gsub(/#{Mx[:pa_non_object_dummy_heading]}/,'')
           if dob.is==:para
             h={ obj: dob.obj, ocn_: false, ocn: nil, hang: dob.hang, indent: dob.indent, bullet_: dob.bullet_, tags: dob.tags, parent: dob.parent }
-            dob=SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h,dob)
+            dob=SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h,dob)
           elsif dob.is==:heading
             h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: false, parent: dob.parent }
-            dob=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,dob)
+            dob=SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h,dob)
           end
         else dob
         end
@@ -1255,7 +1255,7 @@ or this level should be 5~ rather #{dob.lv}" #level 6
       when '6'; 9
       end
       h={ tag: tag, node: o[:node], lv: o[:lv], ln: ln, status: o[:status] }
-      SiSU_DAL_DocumentStructure::ObjectStructure.new.xml_dom(h) #downstream code utilise else ignore like comments
+      SiSU_AO_DocumentStructure::ObjectStructure.new.xml_dom(h) #downstream code utilise else ignore like comments
     end
     def tag_open(o,tag)
       t={ lv: tag[o.ln], node: o.node, status: 'open' }
diff --git a/lib/sisu/v5/dal_endnotes.rb b/lib/sisu/v5/ao_endnotes.rb
index 839691da..981c97f6 100644
--- a/lib/sisu/v5/dal_endnotes.rb
+++ b/lib/sisu/v5/ao_endnotes.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_doc_endnotes.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_doc_endnotes.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_Endnotes
+module SiSU_AO_Endnotes
   class Endnotes
     def initialize(md,data,endnote_array=nil)
       @md,@data,@endnote_array=md,data,endnote_array
diff --git a/lib/sisu/v5/dal_expand_insertions.rb b/lib/sisu/v5/ao_expand_insertions.rb
index e43dd3af..44ae1f60 100644
--- a/lib/sisu/v5/dal_expand_insertions.rb
+++ b/lib/sisu/v5/ao_expand_insertions.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_expand_insertions.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_expand_insertions.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_Insertions
+module SiSU_AO_Insertions
   class Insertions
     def initialize(md,data)
       @md,@data=md,data
diff --git a/lib/sisu/v5/dal_hash_digest.rb b/lib/sisu/v5/ao_hash_digest.rb
index 9f620aa2..70deee80 100644
--- a/lib/sisu/v5/dal_hash_digest.rb
+++ b/lib/sisu/v5/ao_hash_digest.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_hash_digest.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_hash_digest.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_Hash
+module SiSU_AO_Hash
   require_relative 'shared_markup_alt.rb'               #shared_markup_alt.rb
   class ObjectDigest
     def initialize(md,data,env=nil)
diff --git a/lib/sisu/v5/dal_idx.rb b/lib/sisu/v5/ao_idx.rb
index be8a0211..94e3aff6 100644
--- a/lib/sisu/v5/dal_idx.rb
+++ b/lib/sisu/v5/ao_idx.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_idx.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_idx.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_BookIndex
+module SiSU_AO_BookIndex
   class BookIndex
     def initialize(md,data,env=nil)
       @md,@data,@env=md,data,env
@@ -138,15 +138,15 @@ module SiSU_DAL_BookIndex
       idx={}
       idx[:sst_rel_html_seg],idx[:sst_rel],idx[:html],idx[:xhtml]=[],[],[],[]
       h={obj: Mx[:br_page]}
-      o=SiSU_DAL_DocumentStructure::ObjectLayout.new.break(h)
+      o=SiSU_AO_DocumentStructure::ObjectLayout.new.break(h)
       idx[:sst_rel_html_seg] << o
       idx[:sst_rel] << o
       h={lv: '2', name: 'index', obj: "Index"}
-      o=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
+      o=SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
       idx[:sst_rel_html_seg] << o
       idx[:sst_rel] << o
       h={lv: '4', name: 'idx', obj: " [Index] #{Mx[:pa_non_object_dummy_heading]}"}
-      o=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
+      o=SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
       idx[:sst_rel_html_seg] << o
       idx[:sst_rel] << o
       alph=%W[9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
diff --git a/lib/sisu/v5/dal_images.rb b/lib/sisu/v5/ao_images.rb
index 33a5e627..4354dfa9 100644
--- a/lib/sisu/v5/dal_images.rb
+++ b/lib/sisu/v5/ao_images.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_images.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_images.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_Images
+module SiSU_AO_Images
   class Images
     #require 'RMagick'
     #include Magick
diff --git a/lib/sisu/v5/dal_metadata.rb b/lib/sisu/v5/ao_metadata.rb
index 1fa5619c..8d017769 100644
--- a/lib/sisu/v5/dal_metadata.rb
+++ b/lib/sisu/v5/ao_metadata.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_metadata.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_metadata.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_Metadata
+module SiSU_AO_Metadata
   class Metadata
     def initialize(md,metad)
       @md,@metadata=md,metad
@@ -69,11 +69,11 @@ module SiSU_DAL_Metadata
     end
     def make_para(obj,ocn)
       h={ obj: obj, ocn: 0 }
-      SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h)
+      SiSU_AO_DocumentStructure::ObjectPara.new.paragraph(h)
     end
     def make_heading(obj,ocn,name,lv,ln)
       h={ lv: lv, ln: ln, name: name, obj: obj, ocn: 0 }
-      SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h)
+      SiSU_AO_DocumentStructure::ObjectHeading.new.heading(h)
     end
     def metadata
     end
diff --git a/lib/sisu/v5/dal_misc_arrange.rb b/lib/sisu/v5/ao_misc_arrange.rb
index e6cc72db..8f7acbc4 100644
--- a/lib/sisu/v5/dal_misc_arrange.rb
+++ b/lib/sisu/v5/ao_misc_arrange.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_misc_arrange.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_misc_arrange.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_MiscArrangeText
+module SiSU_AO_MiscArrangeText
   class SI
     def initialize(md,data)
       @md,@data=md,data
diff --git a/lib/sisu/v5/dal_numbering.rb b/lib/sisu/v5/ao_numbering.rb
index 96f4134b..00afdfa5 100644
--- a/lib/sisu/v5/dal_numbering.rb
+++ b/lib/sisu/v5/ao_numbering.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_numbering.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_numbering.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: system environment, resource control and configuration details
 
 =end
-module SiSU_DAL_Numbering
+module SiSU_AO_Numbering
   class Numbering
     attr_accessor :obj,:osp,:ocn,:lv,:name,:index,:comment
     def initialize(md,data)
@@ -142,7 +142,7 @@ module SiSU_DAL_Numbering
       data=data.compact
       data.each do |dob| #@md.seg_names << [additions to segment names]
         title_no=nil
-        dob=SiSU_DAL_DocumentStructureExtract::Structure.new(@md,dob).structure_markup #must happen earlier, node info etc. require
+        dob=SiSU_AO_DocumentStructureExtract::Structure.new(@md,dob).structure_markup #must happen earlier, node info etc. require
         if dob.is ==:heading \
         && dob.autonum_ \
         and defined? @md.make.num_top \
@@ -232,11 +232,11 @@ module SiSU_DAL_Numbering
       @tuned_file=@tuned_file.flatten
     end
     def ocn(data)                                                                      #and auto segment numbering increment
-      @tuned_file=SiSU_DAL_DocumentStructureExtract::OCN.new(@md,data).ocn
+      @tuned_file=SiSU_AO_DocumentStructureExtract::OCN.new(@md,data).ocn
       @tuned_file
     end
     def xml(data)
-      @tuned_file=SiSU_DAL_DocumentStructureExtract::XML.new(@md,data).dom
+      @tuned_file=SiSU_AO_DocumentStructureExtract::XML.new(@md,data).dom
       @tuned_file
     end
     def minor_numbering(data)                                                          #and auto segment numbering increment
@@ -354,11 +354,11 @@ module SiSU_DAL_Numbering
           m=dob.ln.to_s
           dob_tmp=[]
           if @md.pagenew.inspect =~/#{m}/
-            dob_tmp << SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new]) << dob
+            dob_tmp << SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new]) << dob
           elsif @md.pagebreak.inspect =~/#{m}/
-            dob_tmp << SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page]) << dob
+            dob_tmp << SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page]) << dob
           elsif @md.pageline.inspect =~/#{m}/
-            dob_tmp << SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line]) << dob
+            dob_tmp << SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line]) << dob
           end
           unless dob_tmp.length > 0; dob
           else                       dob_tmp
diff --git a/lib/sisu/v5/dal_syntax.rb b/lib/sisu/v5/ao_syntax.rb
index 1e1d8542..22e0124c 100644
--- a/lib/sisu/v5/dal_syntax.rb
+++ b/lib/sisu/v5/ao_syntax.rb
@@ -50,7 +50,7 @@
 
  * Git
    <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
-   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/dal_syntax.rb;hb=HEAD>
+   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=lib/sisu/v5/ao_syntax.rb;hb=HEAD>
 
  * Ralph Amissah
    <ralph@amissah.com>
@@ -59,7 +59,7 @@
  ** Description: Syntax for markup, input markup syntaxes, determined here
 
 =end
-module SiSU_DAL_Syntax
+module SiSU_AO_Syntax
   class Words
     def initialize(line,md,mkp)
       @line,@md,@mkp=line,md,mkp
diff --git a/lib/sisu/v5/db_import.rb b/lib/sisu/v5/db_import.rb
index 6edb0f99..147f27df 100644
--- a/lib/sisu/v5/db_import.rb
+++ b/lib/sisu/v5/db_import.rb
@@ -121,8 +121,8 @@ module SiSU_DbImport
       @@dl ||=SiSU_Env::InfoEnv.new.digest.length
     end
     def marshal_load
-      require_relative 'dal'                            # dal.rb
-      @dal_array=SiSU_DAL::Source.new(@opt).get            # dal file drawn here
+      require_relative 'ao'                                # ao.rb
+      @dal_array=SiSU_AO::Source.new(@opt).get             # dal file drawn here
       if (@opt.act[:verbose][:set]==:on \
       || @opt.act[:verbose_plus][:set]==:on \
       || @opt.act[:maintenance][:set]==:on)
diff --git a/lib/sisu/v5/git.rb b/lib/sisu/v5/git.rb
index 92322b7c..447117ca 100644
--- a/lib/sisu/v5/git.rb
+++ b/lib/sisu/v5/git.rb
@@ -62,7 +62,7 @@
 module SiSU_Git
   require_relative 'param'                              # param.rb
   require_relative 'sysenv'                             # sysenv.rb
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   class Source
     def initialize(opt)
       @opt=opt
@@ -93,7 +93,7 @@ module SiSU_Git
         video:     git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:video],
         conf:      git_path_fnb + '/' + Gt[:sisupod] + '/' + Gt[:conf]
       }
-      SiSU_DAL::Source.new(@opt).read                                         # -m
+      SiSU_AO::Source.new(@opt).read                                         # -m
     end
     def create_file_structure_git
       make_dir_fnb
@@ -192,7 +192,7 @@ module SiSU_Git
         if composite_src \
         and not @opt.act[:dal][:set]==:on
           ##SiSU_Assemble::Composite.new(@opt).read
-          #SiSU_DAL::Source.new(@opt).read                                         # -m
+          #SiSU_AO::Source.new(@opt).read                                         # -m
           "#{@env.processing_path.composite_file}/#{@opt.fnb}.ssm.sst"
         elsif composite_src
           "#{@env.processing_path.composite_file}/#{@opt.fnb}.ssm.sst"
diff --git a/lib/sisu/v5/html_format.rb b/lib/sisu/v5/html_format.rb
index c087f1ec..3a20ef67 100644
--- a/lib/sisu/v5/html_format.rb
+++ b/lib/sisu/v5/html_format.rb
@@ -904,7 +904,7 @@ WOK
         @lnk_url        =t_o[:lnk_url]        || nil
         @lnk_txt        =t_o[:lnk_txt]        || nil
         @format         =t_o[:format]         || nil
-      elsif t_o.class.inspect =~/^(?:#<)?SiSU_DAL_DocumentStructure/
+      elsif t_o.class.inspect =~/^(?:#<)?SiSU_AO_DocumentStructure/
         @dob=t_o if defined? t_o.is
         @named=nametags_seg(@dob)
         @txt=((defined? t_o.obj) ? t_o.obj : nil)
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index c158f214..c6545c1d 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -286,8 +286,8 @@ module SiSU
               require_relative 'composite'             # composite.rb #pre-processing
               SiSU_Assemble::Composite.new(@opt).read
             end
-            require_relative 'dal'                     # -m     dal.rb
-            SiSU_DAL::Source.new(@opt).read
+            require_relative 'ao'                      # -m     ao.rb
+            SiSU_AO::Source.new(@opt).read
           end
         end
         if @opt.act[:qrcode][:set]==:on                #% --qrcode, -Q
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index 44180819..8f721fd2 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Manpage
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   include SiSU_Param
@@ -100,7 +100,7 @@ module SiSU_Manpage
         || @opt.act[:maintenance][:set]==:on)
           SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").flow
         end
-        @dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
+        @dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
         SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
diff --git a/lib/sisu/v5/odf.rb b/lib/sisu/v5/odf.rb
index 3e83e1cf..b64c8ebe 100644
--- a/lib/sisu/v5/odf.rb
+++ b/lib/sisu/v5/odf.rb
@@ -62,7 +62,7 @@
 module SiSU_ODF
   require_relative 'particulars'                        # particulars.rb
     include SiSU_Particulars
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   include SiSU_Viz
diff --git a/lib/sisu/v5/particulars.rb b/lib/sisu/v5/particulars.rb
index 000748ff..d06afc12 100644
--- a/lib/sisu/v5/particulars.rb
+++ b/lib/sisu/v5/particulars.rb
@@ -66,7 +66,7 @@ module SiSU_Particulars
     include SiSU_Env
   require_relative 'param'                              # param.rb
     include SiSU_Param
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   class CombinedSingleton
     include Singleton
     def get_all(opt)
@@ -152,7 +152,7 @@ module SiSU_Particulars
     attr_accessor :opt,:dal_array
     def set_dal(opt)
       begin
-        @dal_array=SiSU_DAL::Source.new(opt).get
+        @dal_array=SiSU_AO::Source.new(opt).get
         self
       rescue
         SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
@@ -162,7 +162,7 @@ module SiSU_Particulars
     end
     def set_sst_idx(opt)
       begin
-        @sst_idx=SiSU_DAL::Source.new(opt).get_idx_sst
+        @sst_idx=SiSU_AO::Source.new(opt).get_idx_sst
         self
       rescue
         SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
@@ -172,7 +172,7 @@ module SiSU_Particulars
     end
     def set_raw_idx(opt)
       begin
-        @raw_idx=SiSU_DAL::Source.new(opt).get_idx_raw
+        @raw_idx=SiSU_AO::Source.new(opt).get_idx_raw
         self
       rescue
         SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
@@ -182,7 +182,7 @@ module SiSU_Particulars
     end
     def set_html_idx(opt)
       begin
-        @html_idx=SiSU_DAL::Source.new(opt).get_idx_html
+        @html_idx=SiSU_AO::Source.new(opt).get_idx_html
         self
       rescue
         SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
@@ -192,7 +192,7 @@ module SiSU_Particulars
     end
     def set_xhtml_idx(opt)
       begin
-        @xhtml_idx=SiSU_DAL::Source.new(opt).get_idx_xhtml
+        @xhtml_idx=SiSU_AO::Source.new(opt).get_idx_xhtml
         self
       rescue
         SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
@@ -204,7 +204,7 @@ module SiSU_Particulars
     def set_nametags_map(opt)
       begin
         opt=@md ? @md : opt
-        @nametags_map=SiSU_DAL::Source.new(opt).get_map_nametags
+        @nametags_map=SiSU_AO::Source.new(opt).get_map_nametags
         self
       rescue
         if @md
@@ -221,7 +221,7 @@ module SiSU_Particulars
     attr_accessor :ocn_htmlseg_map
     def set_ocn_htmlseg_map(opt)
       begin
-        @ocn_htmlseg_map=SiSU_DAL::Source.new(@md).get_map_ocn_htmlseg
+        @ocn_htmlseg_map=SiSU_AO::Source.new(@md).get_map_ocn_htmlseg
         self
       rescue
         SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
diff --git a/lib/sisu/v5/plaintext.rb b/lib/sisu/v5/plaintext.rb
index 49c198e7..8585ad9d 100644
--- a/lib/sisu/v5/plaintext.rb
+++ b/lib/sisu/v5/plaintext.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Plaintext
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   require_relative 'plaintext_format'                   # plaintext_format.rb
@@ -99,7 +99,7 @@ module SiSU_Plaintext
             SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{md.file.output_path.txt.dir}/#{md.file.base_filename.txt}").flow
           end
         end
-        dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
+        dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
         wrap_width=if defined? md.make.plaintext_wrap \
         and md.make.plaintext_wrap
           md.make.plaintext_wrap
diff --git a/lib/sisu/v5/po4a.rb b/lib/sisu/v5/po4a.rb
index 64f2c18d..43ff51e9 100644
--- a/lib/sisu/v5/po4a.rb
+++ b/lib/sisu/v5/po4a.rb
@@ -61,7 +61,7 @@
 
 =end
 module SiSU_Po4a
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   require_relative 'composite'                          # composite.rb
@@ -101,7 +101,7 @@ module SiSU_Po4a
         end
         md=SiSU_Param::Parameters.new(@opt).get
         src[:files].each do |fn|
-          SiSU_DAL::Source.new(@opt,fn).read             # -m
+          SiSU_AO::Source.new(@opt,fn).read             # -m
           env=SiSU_Env::InfoEnv.new(@opt.fns)
           m=/((.+?)(?:\~\w\w(?:_\w\w)?)?)\.((?:-|ssm\.)?sst|ssm|ssi)$/ #watch added match for sss
           @fnn,@fnb,@fnt=fn[m,1],fn[m,2],fn[m,3]
@@ -126,7 +126,7 @@ module SiSU_Po4a
           if @opt.fns =~/\S+?~#{@lang_regx}\.ss[mti]/ \
           or @opt.f_pth[:lng] !=@opt.lng_base
             opt_lang_trn_fn=fn
-            @dal_array_lang_translation=SiSU_DAL::Source.new(@opt,opt_lang_trn_fn).get # dal file drawn here
+            @dal_array_lang_translation=SiSU_AO::Source.new(@opt,opt_lang_trn_fn).get # dal file drawn here
             opt_lang_src_fn=if fn =~/\S+?~\S{2}(?:_\S{2})?\.ss[mti]/
               fn.gsub(/(\S+?)~\S{2}(?:_\S{2})?(\.ss[mti])/,'\1\2') #check i
             else fn
@@ -141,14 +141,14 @@ module SiSU_Po4a
             else nil
             end
             if FileTest.file?("#{srcdir}/#{opt_lang_src_fn}")
-              @dal_array_lang_src=SiSU_DAL::Source.new(@@opt_src,opt_lang_src_fn).get # dal file drawn here
+              @dal_array_lang_src=SiSU_AO::Source.new(@@opt_src,opt_lang_src_fn).get # dal file drawn here
             else
               puts "no identified source document"
               exit
             end
             Dir.chdir(transdir) if transdir
           else
-            @dal_array_lang_src=SiSU_DAL::Source.new(@opt,fn).get # dal file drawn here
+            @dal_array_lang_src=SiSU_AO::Source.new(@opt,fn).get # dal file drawn here
             @dal_array_lang_translation=nil
           end
           wrap_width=if defined? md.make.plaintext_wrap \
diff --git a/lib/sisu/v5/sst_do_inline_footnotes.rb b/lib/sisu/v5/sst_do_inline_footnotes.rb
index 836d0d29..f03c1c34 100644
--- a/lib/sisu/v5/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v5/sst_do_inline_footnotes.rb
@@ -67,8 +67,8 @@ module SiSU_ConvertFootnotes
     include SiSU_Env
   require_relative 'param'                              # param.rb
     include SiSU_Param
-  require_relative 'dal_syntax'                         # dal_syntax.rb
-    include SiSU_DAL_Syntax
+  require_relative 'ao_syntax'                          # ao_syntax.rb
+    include SiSU_AO_Syntax
   require_relative 'i18n'                               # i18n.rb
   class Instantiate < SiSU_Param::Parameters::Instructions
      @@flag={} #Beware!!
diff --git a/lib/sisu/v5/sst_to_s_xml_sax.rb b/lib/sisu/v5/sst_to_s_xml_sax.rb
index d6767595..a3fbde9f 100644
--- a/lib/sisu/v5/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v5/sst_to_s_xml_sax.rb
@@ -68,7 +68,7 @@ module SiSU_SimpleXML_ModelSax
     include SiSU_Param
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
-  require_relative 'dal_doc_str'                        # dal_doc_str.rb
+  require_relative 'ao_doc_str'                         # ao_doc_str.rb
   require_relative 'shared_xml'                         # shared_xml.rb
     include SiSU_XML_Munge
   require_relative 'shared_sem'                         # shared_sem.rb
@@ -276,7 +276,7 @@ WOK
         (0..6).each { |x| @cont[x]=@level[x]=false }
         (4..6).each { |x| @xml_contents_close[x]='' }
         @data.each do |para|
-          data << SiSU_DAL_DocumentStructureExtract::Structure.new(@md,para).structure #takes on Mx marks
+          data << SiSU_AO_DocumentStructureExtract::Structure.new(@md,para).structure #takes on Mx marks
         end
         data.each do |para|
           if para !~/^\s*(?:%+ |<:code>)/
diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb
index d4079f8c..19031711 100644
--- a/lib/sisu/v5/sysenv.rb
+++ b/lib/sisu/v5/sysenv.rb
@@ -142,7 +142,7 @@ module SiSU_Env
     PROCESSING_PATH=:processing_path
     PROCESSING_DIR_TMP_ROOT=:processing_dir_tmp_root
     PROCESSING_PATH_TMP_BASE=:processing_path_tmp_base
-    PROCESSING_DAL=:processing_dal
+    PROCESSING_AO=:processing_dal
     PROCESSING_TUNE=:processing_tune
     PROCESSING_LATEX=:processing_latex
     PROCESSING_TEXINFO=:processing_texinfo
@@ -186,7 +186,7 @@ module SiSU_Env
       PROCESSING_PATH =>          processing_pth,
       PROCESSING_DIR_TMP_ROOT  => prcss_dir_tmp_root,
       PROCESSING_PATH_TMP_BASE => processing_pth,
-      PROCESSING_DAL =>           'dal',
+      PROCESSING_AO =>            'ao',
       PROCESSING_TUNE =>          'tune',
       PROCESSING_LATEX =>         'tex',
       PROCESSING_TEXINFO =>       'texinfo',
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb
index 2dc3e860..df089d31 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -81,8 +81,8 @@ module SiSU_TeX
     require_relative 'sysenv'                           # sysenv.rb
       include SiSU_Env
     include SiSU_Viz
-    require_relative 'dal'                              # dal.rb
-      include SiSU_DAL
+    require_relative 'ao'                               # ao.rb
+      include SiSU_AO
     include SiSU_TeX
     def initialize(opt)
       @opt=opt
@@ -126,7 +126,7 @@ module SiSU_TeX
         $flag=@md.opt.cmd                                                          #introduced to pass 0 for no object citation numbers... to texpdf_format
         directories
                                                                                #% needed needs to be reprogrammed !!!
-        dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
+        dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
         SiSU_TeX::Source::LaTeXcreate.new(@particulars).songsheet
         dal_array=''
         pwd=Dir.pwd
@@ -1042,7 +1042,7 @@ module SiSU_TeX
                   file[:landscape].puts morph,"\n"
                 end
               end
-            elsif morph.class.inspect =~ /SiSU_DAL_DocumentStructure/ \
+            elsif morph.class.inspect =~ /SiSU_AO_DocumentStructure/ \
             and morph.tmp \
             and morph.tmp.is_a?(String)
               if morph.is !=:code \
diff --git a/lib/sisu/v5/wikispeak.rb b/lib/sisu/v5/wikispeak.rb
index da8fc9fa..eab2336d 100644
--- a/lib/sisu/v5/wikispeak.rb
+++ b/lib/sisu/v5/wikispeak.rb
@@ -60,7 +60,7 @@
 
 =end
 module SiSU_Wikispeak
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   include SiSU_Param
@@ -90,7 +90,7 @@ module SiSU_Wikispeak
         || @opt.act[:maintenance][:set]==:on)
           SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:wiki]}").flow
         end
-        @dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here
+        @dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
         SiSU_Wikispeak::Source::Scroll.new(@dal_array,@md).songsheet
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb
index f6d86883..36a0dae1 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/v5/xml_dom.rb
@@ -66,7 +66,7 @@ module SiSU_XML_DOM
     include SiSU_Particulars
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   require_relative 'shared_xml'                         # shared_xml.rb
     include SiSU_XML_Munge
   require_relative 'xml_format'                         # xml_format.rb
diff --git a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb b/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
index a90207ff..8f14ea54 100644
--- a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
@@ -62,7 +62,7 @@
 module SiSU_XML_Scaffold_Structure_Collapse
   require_relative 'particulars'                        # particulars.rb
     include SiSU_Particulars
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   class Source
diff --git a/lib/sisu/v5/xml_scaffold_structure_sisu.rb b/lib/sisu/v5/xml_scaffold_structure_sisu.rb
index 64173566..12e1088a 100644
--- a/lib/sisu/v5/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/v5/xml_scaffold_structure_sisu.rb
@@ -62,7 +62,7 @@
 module SiSU_XML_Scaffold_Structure_Sisu
   require_relative 'particulars'                        # particulars.rb
     include SiSU_Particulars
-  require_relative 'dal'                                # dal.rb
+  require_relative 'ao'                                 # ao.rb
   require_relative 'sysenv'                             # sysenv.rb
     include SiSU_Env
   class Source