Change name and singleton params here if anything needs to changed in the docbook based on my earlier comments.