157 files changed, 48 insertions, 48 deletions
diff --git a/rpkid/Doxyfile b/rpkid/Doxyfile
index baee27b4..c432a42d 100644
--- a/rpkid/Doxyfile
+++ b/rpkid/Doxyfile
@@ -474,7 +474,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = rpki rpkid.py pubd.py irdbd.py rootd.py irbe-cli.py cross-certify.py
+INPUT                  = rpki rpkid.py pubd.py irdbd.py rootd.py irbe_cli.py cross_certify.py
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
diff --git a/rpkid/Makefile b/rpkid/Makefile
index cf76ac11..712c2ef8 100644
--- a/rpkid/Makefile
+++ b/rpkid/Makefile
@@ -68,8 +68,8 @@ resource-cert-samples/.stamp: generate-testrepo.py Makefile
 	python generate-testrepo.py
 	touch $@
 
-irbe-cli.usage: irbe-cli.py
-	python irbe-cli.py --help | sed 's/^/      /' >$@
+irbe_cli.usage: irbe_cli.py
+	python irbe_cli.py --help | sed 's/^/      /' >$@
 
 tags:
 	find . -type f -name '*.py' ! -name relaxng.py | etags -
@@ -118,7 +118,7 @@ doc:: doc/irdbd.pdf doc/pubd.pdf doc/rpkid.pdf
 # Certain invocations of Graphviz by Doxygen whine about fonts.  Not
 # clear whose bug this is.  Apparently harmless, so just ignore it.
 
-dox doxygen: irbe-cli.usage doc/irdbd.dot doc/pubd.dot doc/rpkid.dot
+dox doxygen: irbe_cli.usage doc/irdbd.dot doc/pubd.dot doc/rpkid.dot
 	TZ='' doxygen 2>&1 | awk '$$0 != "Error: Could not find/open font"'
 	cd doc/latex && TZ='' ${MAKE} >/dev/null 2>&1
 	for i in Installation Operation Left-right Publication; do \
diff --git a/rpkid/cross-certify.py b/rpkid/cross_certify.py
index db21ae6b..88c5718f 100644
--- a/rpkid/cross-certify.py
+++ b/rpkid/cross_certify.py
@@ -8,7 +8,7 @@ Much of this code lifted from rpki.x509.X509.issue(), but this is a
 sufficiently different purpose that it's probably not worth
 refactoring.
 
-Usage: python cross-certify.py { -i | --in     } input_cert
+Usage: python cross_certify.py { -i | --in     } input_cert
                                { -c | --ca     } issuing_cert
                                { -k | --key    } issuing_cert_key
                                { -s | --serial } serial_filename
diff --git a/rpkid/irbe-setup.py b/rpkid/irbe-setup.py
index 4fde559c..45da98bb 100644
--- a/rpkid/irbe-setup.py
+++ b/rpkid/irbe-setup.py
@@ -25,7 +25,7 @@ import rpki.x509, rpki.config, rpki.log
 
 rpki.log.init("irbe-setup")
 
-cfg = rpki.config.parser("irbe.conf", "irbe-cli")
+cfg = rpki.config.parser("irbe.conf", "irbe_cli")
 
 db = MySQLdb.connect(user   = cfg.get("sql-username", section = "irdbd"),
                      db     = cfg.get("sql-database", section = "irdbd"),
diff --git a/rpkid/irbe-cli.py b/rpkid/irbe_cli.py
index 25a1d1bd..dda476c5 100755
--- a/rpkid/irbe-cli.py
+++ b/rpkid/irbe_cli.py
@@ -236,7 +236,7 @@ def call_daemon(cms_class, client_key, client_cert, server_ta, url, q_msg):
 
 # Main program
 
-rpki.log.init("irbe-cli")
+rpki.log.init("irbe_cli")
 
 argv = sys.argv[1:]
 
@@ -260,7 +260,7 @@ for o, a in opts:
 if not argv:
   usage(1)
 
-cfg = rpki.config.parser(cfg_file, "irbe-cli")
+cfg = rpki.config.parser(cfg_file, "irbe_cli")
 
 q_msg_left_right = left_right_msg()
 q_msg_left_right.type = "query"
diff --git a/rpkid/irbe-cli.usage b/rpkid/irbe_cli.usage
index 263b0d81..ce43cb16 100644
--- a/rpkid/irbe-cli.usage
+++ b/rpkid/irbe_cli.usage
@@ -1,6 +1,6 @@
       Command line IR back-end control program for rpkid and pubd.
       
-      $Id: irbe-cli.py 1880 2008-06-12 21:54:53Z sra $
+      $Id: irbe_cli.py 1880 2008-06-12 21:54:53Z sra $
       
       Copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
       
diff --git a/rpkid/rpki/__init__.py b/rpkid/rpki/__init__.py
index db69fbfc..5470e708 100644
--- a/rpkid/rpki/__init__.py
+++ b/rpkid/rpki/__init__.py
@@ -20,7 +20,7 @@
 # since its existance defines the package, it's as sensible a place as
 # any to put the Doxygen mainpage.
 
-# The "usage" text for irbe-cli in the OPERATIONS section is generated
+# The "usage" text for irbe_cli in the OPERATIONS section is generated
 # automatically by running the program with its --help command.
 # Should do the same with the other programs.  Don't yet have a sane
 # way to automate options in config files, though.  Would be nice.
@@ -273,11 +273,11 @@
 #              rpkid calls into this to perform lookups via the
 #              left-right protocol.
 #
-# @li @c irbe-cli.py:
+# @li @c irbe_cli.py:
 #              A command-line client for the left-right control
 #              protocol.
 #
-# @li @c cross-certify.py:
+# @li @c cross_certify.py:
 #              A BPKI cross-certification tool.
 #
 # @li @c irbe-setup.py:
@@ -337,7 +337,7 @@
 # @endlink followed by dynamic configuration via the left-right
 # protocol.  In production use the latter stage would be handled by
 # the IRBE stub; for test and develoment purposes it's handled by the
-# irbe-cli.py command line interface or by the testbed.py test
+# irbe_cli.py command line interface or by the testbed.py test
 # framework.
 #
 # rpkid stores dynamic data in an SQL database, which must have been
@@ -623,14 +623,14 @@
 #                      Service URL for irdbd.  Must be a %https:// URL.
 #
 #
-# @section irdbd_cli irbe-cli.py
+# @section irdbd_cli irbe_cli.py
 #
-# irbe-cli is a simple command line client for the control subsets of
+# irbe_cli is a simple command line client for the control subsets of
 # the @link Left-right left-right @endlink and @link Publication
 # publication @endlink protocols.  In production use this
 # functionality would be part of the IRBE stub.
 #
-# Basic configuration of irbe-cli is handled via a %config file.  The
+# Basic configuration of irbe_cli is handled via a %config file.  The
 # specific action or actions to be performed are specified on the
 # command line, and map closely to the protocols themselves.
 #
@@ -644,7 +644,7 @@
 # these requests off to the business PKI in order to issue signing
 # certs corresponding to newly generated business keys.
 #
-# @verbinclude irbe-cli.usage
+# @verbinclude irbe_cli.usage
 #
 # Global options (@c --config, @c --help, @c --pem_out) come first,
 # then zero or more commands (@c parent, @c repository, @c self, @c
@@ -666,10 +666,10 @@
 # takes a value, eg, "--action create" or "--action=create".  Options
 # without a trailing "=" correspond to boolean control attributes.
 #
-# The default %config file for irbe-cli is irbe-cli.conf, start
-# irbe-cli with "-c filename" (or "--config filename") to choose a
+# The default %config file for irbe_cli is irbe_cli.conf, start
+# irbe_cli with "-c filename" (or "--config filename") to choose a
 # different %config file.  All options are in the section
-# "[irbe-cli]".  Certificates, keys, and trust anchors may be in
+# "[irbe_cli]".  Certificates, keys, and trust anchors may be in
 # either DER or PEM format.
 #
 # %Config file options:
@@ -680,7 +680,7 @@
 #
 # @li @c rpkid-irbe-cert:
 #                      Name of file containing BPKI certificate
-#                      irbe-cli should use when talking to rpkid.
+#                      irbe_cli should use when talking to rpkid.
 #
 # @li @c rpkid-irbe-key:
 #                      Name of file containing RSA key corresponding to
@@ -698,7 +698,7 @@
 #
 # @li @c pubd-irbe-cert:
 #                      Name of file containing BPKI certificate
-#                      irbe-cli should use when talking to pubd.
+#                      irbe_cli should use when talking to pubd.
 #
 # @li @c pubd-irbe-key:
 #                      Name of file containing RSA key corresponding to
@@ -712,16 +712,16 @@
 #
 #
 #
-# @section cross_certify cross-certify.py
+# @section cross_certify cross_certify.py
 #
-# cross-certify.py is a small tool to extract certain fields from an
+# cross_certify.py is a small tool to extract certain fields from an
 # existing X.509 certificate and generate issue a new certificate that
-# can be used as part of a cross-certification chain.  cross-certify
+# can be used as part of a cross-certification chain.  cross_certify
 # doesn't take a config file, all of its arguments are specified on
 # the command line.
 #
 # @verbatim
-#    python cross-certify.py { -i | --in     } input_cert
+#    python cross_certify.py { -i | --in     } input_cert
 #                            { -c | --ca     } issuing_cert
 #                            { -k | --key    } issuing_cert_key
 #                            { -s | --serial } serial_filename
@@ -741,10 +741,10 @@
 #
 # The default %config file is irbe.conf, start rpkid with "-c filename"
 # to choose a different %config file.  Most options are in the section
-# "[irbe-cli]", but a few are in the section "[irdbd]".  Certificates,
+# "[irbe_cli]", but a few are in the section "[irdbd]".  Certificates,
 # keys, and trust anchors may be in either DER or PEM format.
 #
-# Options in the "[irbe-cli]" section:
+# Options in the "[irbe_cli]" section:
 #
 # @li @c bpki-ta:
 #                      Name of file containing BPKI trust anchor.
diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index af23ef3a..9be8aae3 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -981,7 +981,7 @@ irdbd-cert      = %(my_name)s-IRDB.cer
 irdbd-key       = %(my_name)s-IRDB.key
 https-url       = https://localhost:%(irdb_port)d/
 
-[irbe-cli]
+[irbe_cli]
 
 bpki-ta         = %(my_name)s-TA.cer
 rpkid-cert      = %(my_name)s-RPKI.cer
diff --git a/rpkid/apnic-poke-1.sh b/scripts/apnic-poke-1.sh
index b7167220..bca4a8f6 100644
--- a/rpkid/apnic-poke-1.sh
+++ b/scripts/apnic-poke-1.sh
@@ -61,27 +61,27 @@ fi
 
 # Create a self instance
 
-python irbe-cli.py self --action create --crl_interval 84600
+python irbe_cli.py self --action create --crl_interval 84600
 
 # Create a business signing context, issue the necessary business cert, and set up the cert chain
 
-python irbe-cli.py --pem_out bsc.req bsc --action create --self_id 1 \
+python irbe_cli.py --pem_out bsc.req bsc --action create --self_id 1 \
     --generate_keypair --signing_cert biz-certs/Bob-CA.cer
 
 $openssl x509 -req -in bsc.req -out bsc.cer -CA biz-certs/Bob-CA.cer \
     -CAkey biz-certs/Bob-CA.key -CAserial biz-certs/Bob-CA.srl
 
-python irbe-cli.py bsc --action set --self_id 1 --bsc_id 1 --signing_cert bsc.cer
+python irbe_cli.py bsc --action set --self_id 1 --bsc_id 1 --signing_cert bsc.cer
 
 rm -f bsc.req bsc.cer
 
 # Create a repository context
 
-python irbe-cli.py repository --self_id 1 --action create --bsc_id 1
+python irbe_cli.py repository --self_id 1 --action create --bsc_id 1
 
 # Create a parent context pointing at rootd.py
 
-python irbe-cli.py parent --self_id 1 --action create --bsc_id 1 --repository_id 1 \
+python irbe_cli.py parent --self_id 1 --action create --bsc_id 1 --repository_id 1 \
     --peer_contact_uri https://localhost:44333/ \
     --cms_ta biz-certs/Elena-Root.cer \
     --https_ta biz-certs/Elena-Root.cer \
@@ -89,7 +89,7 @@ python irbe-cli.py parent --self_id 1 --action create --bsc_id 1 --repository_id
 
 # Create a child context
 
-python irbe-cli.py child --self_id 1 --action create --bsc_id 1 --cms_ta biz-certs/Frank-Root.cer
+python irbe_cli.py child --self_id 1 --action create --bsc_id 1 --cms_ta biz-certs/Frank-Root.cer
 
 # Run the other daemons, arrange for everything to go away on shutdown,
 # run initial cron job to set things up, then wait
diff --git a/rpkid/apnic-poke-1.yaml b/scripts/apnic-poke-1.yaml
index 24b80561..24b80561 100644
--- a/rpkid/apnic-poke-1.yaml
+++ b/scripts/apnic-poke-1.yaml
diff --git a/rpkid/apnic-poke-2.sh b/scripts/apnic-poke-2.sh
index 4ba1dc9e..87018111 100644
--- a/rpkid/apnic-poke-2.sh
+++ b/scripts/apnic-poke-2.sh
@@ -42,24 +42,24 @@ fi
 
 # Create a self instance
 
-python irbe-cli.py self --action create --crl_interval 84600
+python irbe_cli.py self --action create --crl_interval 84600
 
 # Create a business signing context, issue the necessary business cert, and set up the cert chain
 
-python irbe-cli.py --pem_out bsc.req bsc --action create --self_id 1 \
+python irbe_cli.py --pem_out bsc.req bsc --action create --self_id 1 \
     --generate_keypair --signing_cert biz-certs/Bob-CA.cer
 $openssl x509 -req -in bsc.req -out bsc.cer \
     -CA biz-certs/Bob-CA.cer -CAkey biz-certs/Bob-CA.key -CAserial biz-certs/Bob-CA.srl
-python irbe-cli.py bsc --action set --self_id 1 --bsc_id 1 --signing_cert bsc.cer
+python irbe_cli.py bsc --action set --self_id 1 --bsc_id 1 --signing_cert bsc.cer
 rm -f bsc.req bsc.cer
 
 # List what's in the BSC, for today's debugging fun
 
-#python irbe-cli.py bsc --action list --self_id 1
+#python irbe_cli.py bsc --action list --self_id 1
 
 # Create a repository context
 
-python irbe-cli.py repository --self_id 1 --action create --bsc_id 1
+python irbe_cli.py repository --self_id 1 --action create --bsc_id 1
 
 # Create a parent context pointing at APNIC -- this is where we plug in the values from their YAML
 
@@ -90,7 +90,7 @@ cat >apnic.pem <<-'EOF'
 	-----END CERTIFICATE-----
 EOF
 
-python irbe-cli.py parent --self_id 1 --action create --bsc_id 1 --repository_id 1 \
+python irbe_cli.py parent --self_id 1 --action create --bsc_id 1 --repository_id 1 \
     --peer_contact_uri https://mirin.apnic.net/cgi-bin/up-down-parent.cgi \
     --cms_ta   apnic.pem \
     --https_ta apnic.pem \
@@ -102,7 +102,7 @@ rm -f apnic.pem
 
 # Create a child context
 
-python irbe-cli.py child --self_id 1 --action create --bsc_id 1 --cms_ta biz-certs/Frank-Root.cer
+python irbe_cli.py child --self_id 1 --action create --bsc_id 1 --cms_ta biz-certs/Frank-Root.cer
 
 # Run the other daemons, arrange for everything to go away on shutdown,
 # run initial cron job to set things up, then wait
diff --git a/rpkid/apnic-poke-2.yaml b/scripts/apnic-poke-2.yaml
index 6ba93729..6ba93729 100644
--- a/rpkid/apnic-poke-2.yaml
+++ b/scripts/apnic-poke-2.yaml
diff --git a/rpkid/apnic-test-3.tgz b/scripts/apnic-test-3.tgz
index 2d50fe3f..2d50fe3f 100644
--- a/rpkid/apnic-test-3.tgz
+++ b/scripts/apnic-test-3.tgz
diff --git a/rpkid/biz-certs-setup.sh b/scripts/biz-certs-setup.sh
index 64ebd7d8..64ebd7d8 100644
--- a/rpkid/biz-certs-setup.sh
+++ b/scripts/biz-certs-setup.sh
diff --git a/rpkid/biz-certs/08fd5b15.0 b/scripts/biz-certs/08fd5b15.0
index 4e65bd46..4e65bd46 120000
--- a/rpkid/biz-certs/08fd5b15.0
+++ b/scripts/biz-certs/08fd5b15.0
diff --git a/rpkid/biz-certs/0cb21e6a.0 b/scripts/biz-certs/0cb21e6a.0
index 0bbc896d..0bbc896d 120000
--- a/rpkid/biz-certs/0cb21e6a.0
+++ b/scripts/biz-certs/0cb21e6a.0
diff --git a/rpkid/biz-certs/33b6d09e.0 b/scripts/biz-certs/33b6d09e.0
index 6a20c98c..6a20c98c 120000
--- a/rpkid/biz-certs/33b6d09e.0
+++ b/scripts/biz-certs/33b6d09e.0
diff --git a/rpkid/biz-certs/5210f268.0 b/scripts/biz-certs/5210f268.0
index 2a347add..2a347add 120000
--- a/rpkid/biz-certs/5210f268.0
+++ b/scripts/biz-certs/5210f268.0
diff --git a/rpkid/biz-certs/5ebf1062.0 b/scripts/biz-certs/5ebf1062.0
index 16d11802..16d11802 120000
--- a/rpkid/biz-certs/5ebf1062.0
+++ b/scripts/biz-certs/5ebf1062.0
diff --git a/rpkid/biz-certs/60ac264c.0 b/scripts/biz-certs/60ac264c.0
index 2f3644fd..2f3644fd 120000
--- a/rpkid/biz-certs/60ac264c.0
+++ b/scripts/biz-certs/60ac264c.0
diff --git a/rpkid/biz-certs/623ab26c.0 b/scripts/biz-certs/623ab26c.0
index 95960a41..95960a41 120000
--- a/rpkid/biz-certs/623ab26c.0
+++ b/scripts/biz-certs/623ab26c.0
diff --git a/rpkid/biz-certs/6878697a.0 b/scripts/biz-certs/6878697a.0
index efc1dc95..efc1dc95 120000
--- a/rpkid/biz-certs/6878697a.0
+++ b/scripts/biz-certs/6878697a.0
diff --git a/rpkid/biz-certs/71288ec9.0 b/scripts/biz-certs/71288ec9.0
index b05a359f..b05a359f 120000
--- a/rpkid/biz-certs/71288ec9.0
+++ b/scripts/biz-certs/71288ec9.0
diff --git a/rpkid/biz-certs/7449ce31.0 b/scripts/biz-certs/7449ce31.0
index 30a5b8ce..30a5b8ce 120000
--- a/rpkid/biz-certs/7449ce31.0
+++ b/scripts/biz-certs/7449ce31.0
diff --git a/rpkid/biz-certs/7562977b.0 b/scripts/biz-certs/7562977b.0
index 808e8a92..808e8a92 120000
--- a/rpkid/biz-certs/7562977b.0
+++ b/scripts/biz-certs/7562977b.0
diff --git a/rpkid/biz-certs/80e4ab61.0 b/scripts/biz-certs/80e4ab61.0
index 17d44d15..17d44d15 120000
--- a/rpkid/biz-certs/80e4ab61.0
+++ b/scripts/biz-certs/80e4ab61.0
diff --git a/rpkid/biz-certs/826d8d65.0 b/scripts/biz-certs/826d8d65.0
index 21b78ac1..21b78ac1 120000
--- a/rpkid/biz-certs/826d8d65.0
+++ b/scripts/biz-certs/826d8d65.0
diff --git a/rpkid/biz-certs/9844d0ad.0 b/scripts/biz-certs/9844d0ad.0
index 75a23567..75a23567 120000
--- a/rpkid/biz-certs/9844d0ad.0
+++ b/scripts/biz-certs/9844d0ad.0
diff --git a/rpkid/biz-certs/9970e247.0 b/scripts/biz-certs/9970e247.0
index a40c06f6..a40c06f6 120000
--- a/rpkid/biz-certs/9970e247.0
+++ b/scripts/biz-certs/9970e247.0
diff --git a/rpkid/biz-certs/Alice-CA.cer b/scripts/biz-certs/Alice-CA.cer
index 0cddaa07..0cddaa07 100644
--- a/rpkid/biz-certs/Alice-CA.cer
+++ b/scripts/biz-certs/Alice-CA.cer
diff --git a/rpkid/biz-certs/Alice-CA.cnf b/scripts/biz-certs/Alice-CA.cnf
index 5abe8b6e..5abe8b6e 100644
--- a/rpkid/biz-certs/Alice-CA.cnf
+++ b/scripts/biz-certs/Alice-CA.cnf
diff --git a/rpkid/biz-certs/Alice-CA.key b/scripts/biz-certs/Alice-CA.key
index a5b32f93..a5b32f93 100644
--- a/rpkid/biz-certs/Alice-CA.key
+++ b/scripts/biz-certs/Alice-CA.key
diff --git a/rpkid/biz-certs/Alice-CA.req b/scripts/biz-certs/Alice-CA.req
index 0c05472c..0c05472c 100644
--- a/rpkid/biz-certs/Alice-CA.req
+++ b/scripts/biz-certs/Alice-CA.req
diff --git a/rpkid/biz-certs/Alice-CA.srl b/scripts/biz-certs/Alice-CA.srl
index 8136e7f9..8136e7f9 100644
--- a/rpkid/biz-certs/Alice-CA.srl
+++ b/scripts/biz-certs/Alice-CA.srl
diff --git a/rpkid/biz-certs/Alice-EE.cer b/scripts/biz-certs/Alice-EE.cer
index daab1215..daab1215 100644
--- a/rpkid/biz-certs/Alice-EE.cer
+++ b/scripts/biz-certs/Alice-EE.cer
diff --git a/rpkid/biz-certs/Alice-EE.cnf b/scripts/biz-certs/Alice-EE.cnf
index 2437773c..2437773c 100644
--- a/rpkid/biz-certs/Alice-EE.cnf
+++ b/scripts/biz-certs/Alice-EE.cnf
diff --git a/rpkid/biz-certs/Alice-EE.key b/scripts/biz-certs/Alice-EE.key
index 709a07a9..709a07a9 100644
--- a/rpkid/biz-certs/Alice-EE.key
+++ b/scripts/biz-certs/Alice-EE.key
diff --git a/rpkid/biz-certs/Alice-EE.req b/scripts/biz-certs/Alice-EE.req
index 43e0789f..43e0789f 100644
--- a/rpkid/biz-certs/Alice-EE.req
+++ b/scripts/biz-certs/Alice-EE.req
diff --git a/rpkid/biz-certs/Alice-Root.cer b/scripts/biz-certs/Alice-Root.cer
index 3ac7fd7c..3ac7fd7c 100644
--- a/rpkid/biz-certs/Alice-Root.cer
+++ b/scripts/biz-certs/Alice-Root.cer
diff --git a/rpkid/biz-certs/Alice-Root.cnf b/scripts/biz-certs/Alice-Root.cnf
index 03bc395b..03bc395b 100644
--- a/rpkid/biz-certs/Alice-Root.cnf
+++ b/scripts/biz-certs/Alice-Root.cnf
diff --git a/rpkid/biz-certs/Alice-Root.key b/scripts/biz-certs/Alice-Root.key
index 1c417192..1c417192 100644
--- a/rpkid/biz-certs/Alice-Root.key
+++ b/scripts/biz-certs/Alice-Root.key
diff --git a/rpkid/biz-certs/Alice-Root.req b/scripts/biz-certs/Alice-Root.req
index ca1560f9..ca1560f9 100644
--- a/rpkid/biz-certs/Alice-Root.req
+++ b/scripts/biz-certs/Alice-Root.req
diff --git a/rpkid/biz-certs/Alice-Root.srl b/scripts/biz-certs/Alice-Root.srl
index 2b277fe6..2b277fe6 100644
--- a/rpkid/biz-certs/Alice-Root.srl
+++ b/scripts/biz-certs/Alice-Root.srl
diff --git a/rpkid/biz-certs/Bob-CA.cer b/scripts/biz-certs/Bob-CA.cer
index be1ef601..be1ef601 100644
--- a/rpkid/biz-certs/Bob-CA.cer
+++ b/scripts/biz-certs/Bob-CA.cer
diff --git a/rpkid/biz-certs/Bob-CA.cnf b/scripts/biz-certs/Bob-CA.cnf
index 8e3e80b6..8e3e80b6 100644
--- a/rpkid/biz-certs/Bob-CA.cnf
+++ b/scripts/biz-certs/Bob-CA.cnf
diff --git a/rpkid/biz-certs/Bob-CA.key b/scripts/biz-certs/Bob-CA.key
index d331ba47..d331ba47 100644
--- a/rpkid/biz-certs/Bob-CA.key
+++ b/scripts/biz-certs/Bob-CA.key
diff --git a/rpkid/biz-certs/Bob-CA.req b/scripts/biz-certs/Bob-CA.req
index 97cf31f4..97cf31f4 100644
--- a/rpkid/biz-certs/Bob-CA.req
+++ b/scripts/biz-certs/Bob-CA.req
diff --git a/rpkid/biz-certs/Bob-CA.srl b/scripts/biz-certs/Bob-CA.srl
index a20e2ccd..a20e2ccd 100644
--- a/rpkid/biz-certs/Bob-CA.srl
+++ b/scripts/biz-certs/Bob-CA.srl
diff --git a/rpkid/biz-certs/Bob-EE.cer b/scripts/biz-certs/Bob-EE.cer
index 43939903..43939903 100644
--- a/rpkid/biz-certs/Bob-EE.cer
+++ b/scripts/biz-certs/Bob-EE.cer
diff --git a/rpkid/biz-certs/Bob-EE.cnf b/scripts/biz-certs/Bob-EE.cnf
index 30075411..30075411 100644
--- a/rpkid/biz-certs/Bob-EE.cnf
+++ b/scripts/biz-certs/Bob-EE.cnf
diff --git a/rpkid/biz-certs/Bob-EE.key b/scripts/biz-certs/Bob-EE.key
index fe2d8a29..fe2d8a29 100644
--- a/rpkid/biz-certs/Bob-EE.key
+++ b/scripts/biz-certs/Bob-EE.key
diff --git a/rpkid/biz-certs/Bob-EE.req b/scripts/biz-certs/Bob-EE.req
index e832fd64..e832fd64 100644
--- a/rpkid/biz-certs/Bob-EE.req
+++ b/scripts/biz-certs/Bob-EE.req
diff --git a/rpkid/biz-certs/Bob-Root.cer b/scripts/biz-certs/Bob-Root.cer
index 3328831f..3328831f 100644
--- a/rpkid/biz-certs/Bob-Root.cer
+++ b/scripts/biz-certs/Bob-Root.cer
diff --git a/rpkid/biz-certs/Bob-Root.cnf b/scripts/biz-certs/Bob-Root.cnf
index 1505abbc..1505abbc 100644
--- a/rpkid/biz-certs/Bob-Root.cnf
+++ b/scripts/biz-certs/Bob-Root.cnf
diff --git a/rpkid/biz-certs/Bob-Root.key b/scripts/biz-certs/Bob-Root.key
index bb9a897e..bb9a897e 100644
--- a/rpkid/biz-certs/Bob-Root.key
+++ b/scripts/biz-certs/Bob-Root.key
diff --git a/rpkid/biz-certs/Bob-Root.req b/scripts/biz-certs/Bob-Root.req
index 62ad1cea..62ad1cea 100644
--- a/rpkid/biz-certs/Bob-Root.req
+++ b/scripts/biz-certs/Bob-Root.req
diff --git a/rpkid/biz-certs/Bob-Root.srl b/scripts/biz-certs/Bob-Root.srl
index 47c05e26..47c05e26 100644
--- a/rpkid/biz-certs/Bob-Root.srl
+++ b/scripts/biz-certs/Bob-Root.srl
diff --git a/rpkid/biz-certs/Carol-CA.cer b/scripts/biz-certs/Carol-CA.cer
index 4a4e5acb..4a4e5acb 100644
--- a/rpkid/biz-certs/Carol-CA.cer
+++ b/scripts/biz-certs/Carol-CA.cer
diff --git a/rpkid/biz-certs/Carol-CA.cnf b/scripts/biz-certs/Carol-CA.cnf
index 8bea44c8..8bea44c8 100644
--- a/rpkid/biz-certs/Carol-CA.cnf
+++ b/scripts/biz-certs/Carol-CA.cnf
diff --git a/rpkid/biz-certs/Carol-CA.key b/scripts/biz-certs/Carol-CA.key
index 3c80b76d..3c80b76d 100644
--- a/rpkid/biz-certs/Carol-CA.key
+++ b/scripts/biz-certs/Carol-CA.key
diff --git a/rpkid/biz-certs/Carol-CA.req b/scripts/biz-certs/Carol-CA.req
index 8760f182..8760f182 100644
--- a/rpkid/biz-certs/Carol-CA.req
+++ b/scripts/biz-certs/Carol-CA.req
diff --git a/rpkid/biz-certs/Carol-CA.srl b/scripts/biz-certs/Carol-CA.srl
index 8db881dc..8db881dc 100644
--- a/rpkid/biz-certs/Carol-CA.srl
+++ b/scripts/biz-certs/Carol-CA.srl
diff --git a/rpkid/biz-certs/Carol-EE.cer b/scripts/biz-certs/Carol-EE.cer
index 5373757b..5373757b 100644
--- a/rpkid/biz-certs/Carol-EE.cer
+++ b/scripts/biz-certs/Carol-EE.cer
diff --git a/rpkid/biz-certs/Carol-EE.cnf b/scripts/biz-certs/Carol-EE.cnf
index 532ba746..532ba746 100644
--- a/rpkid/biz-certs/Carol-EE.cnf
+++ b/scripts/biz-certs/Carol-EE.cnf
diff --git a/rpkid/biz-certs/Carol-EE.key b/scripts/biz-certs/Carol-EE.key
index 2d785124..2d785124 100644
--- a/rpkid/biz-certs/Carol-EE.key
+++ b/scripts/biz-certs/Carol-EE.key
diff --git a/rpkid/biz-certs/Carol-EE.req b/scripts/biz-certs/Carol-EE.req
index 007f0325..007f0325 100644
--- a/rpkid/biz-certs/Carol-EE.req
+++ b/scripts/biz-certs/Carol-EE.req
diff --git a/rpkid/biz-certs/Carol-Root.cer b/scripts/biz-certs/Carol-Root.cer
index c4dfa744..c4dfa744 100644
--- a/rpkid/biz-certs/Carol-Root.cer
+++ b/scripts/biz-certs/Carol-Root.cer
diff --git a/rpkid/biz-certs/Carol-Root.cnf b/scripts/biz-certs/Carol-Root.cnf
index 169a8503..169a8503 100644
--- a/rpkid/biz-certs/Carol-Root.cnf
+++ b/scripts/biz-certs/Carol-Root.cnf
diff --git a/rpkid/biz-certs/Carol-Root.key b/scripts/biz-certs/Carol-Root.key
index 0e41137a..0e41137a 100644
--- a/rpkid/biz-certs/Carol-Root.key
+++ b/scripts/biz-certs/Carol-Root.key
diff --git a/rpkid/biz-certs/Carol-Root.req b/scripts/biz-certs/Carol-Root.req
index 7a28e895..7a28e895 100644
--- a/rpkid/biz-certs/Carol-Root.req
+++ b/scripts/biz-certs/Carol-Root.req
diff --git a/rpkid/biz-certs/Carol-Root.srl b/scripts/biz-certs/Carol-Root.srl
index c75ed246..c75ed246 100644
--- a/rpkid/biz-certs/Carol-Root.srl
+++ b/scripts/biz-certs/Carol-Root.srl
diff --git a/rpkid/biz-certs/Dave-CA.cer b/scripts/biz-certs/Dave-CA.cer
index 52c649f4..52c649f4 100644
--- a/rpkid/biz-certs/Dave-CA.cer
+++ b/scripts/biz-certs/Dave-CA.cer
diff --git a/rpkid/biz-certs/Dave-CA.cnf b/scripts/biz-certs/Dave-CA.cnf
index 47725a24..47725a24 100644
--- a/rpkid/biz-certs/Dave-CA.cnf
+++ b/scripts/biz-certs/Dave-CA.cnf
diff --git a/rpkid/biz-certs/Dave-CA.key b/scripts/biz-certs/Dave-CA.key
index d8264c2c..d8264c2c 100644
--- a/rpkid/biz-certs/Dave-CA.key
+++ b/scripts/biz-certs/Dave-CA.key
diff --git a/rpkid/biz-certs/Dave-CA.req b/scripts/biz-certs/Dave-CA.req
index 40979783..40979783 100644
--- a/rpkid/biz-certs/Dave-CA.req
+++ b/scripts/biz-certs/Dave-CA.req
diff --git a/rpkid/biz-certs/Dave-CA.srl b/scripts/biz-certs/Dave-CA.srl
index 2fa6581e..2fa6581e 100644
--- a/rpkid/biz-certs/Dave-CA.srl
+++ b/scripts/biz-certs/Dave-CA.srl
diff --git a/rpkid/biz-certs/Dave-EE.cer b/scripts/biz-certs/Dave-EE.cer
index f7352ada..f7352ada 100644
--- a/rpkid/biz-certs/Dave-EE.cer
+++ b/scripts/biz-certs/Dave-EE.cer
diff --git a/rpkid/biz-certs/Dave-EE.cnf b/scripts/biz-certs/Dave-EE.cnf
index 073a1585..073a1585 100644
--- a/rpkid/biz-certs/Dave-EE.cnf
+++ b/scripts/biz-certs/Dave-EE.cnf
diff --git a/rpkid/biz-certs/Dave-EE.key b/scripts/biz-certs/Dave-EE.key
index 283db731..283db731 100644
--- a/rpkid/biz-certs/Dave-EE.key
+++ b/scripts/biz-certs/Dave-EE.key
diff --git a/rpkid/biz-certs/Dave-EE.req b/scripts/biz-certs/Dave-EE.req
index cda158ec..cda158ec 100644
--- a/rpkid/biz-certs/Dave-EE.req
+++ b/scripts/biz-certs/Dave-EE.req
diff --git a/rpkid/biz-certs/Dave-Root.cer b/scripts/biz-certs/Dave-Root.cer
index 88d3de61..88d3de61 100644
--- a/rpkid/biz-certs/Dave-Root.cer
+++ b/scripts/biz-certs/Dave-Root.cer
diff --git a/rpkid/biz-certs/Dave-Root.cnf b/scripts/biz-certs/Dave-Root.cnf
index 84840989..84840989 100644
--- a/rpkid/biz-certs/Dave-Root.cnf
+++ b/scripts/biz-certs/Dave-Root.cnf
diff --git a/rpkid/biz-certs/Dave-Root.key b/scripts/biz-certs/Dave-Root.key
index 4c5b73bf..4c5b73bf 100644
--- a/rpkid/biz-certs/Dave-Root.key
+++ b/scripts/biz-certs/Dave-Root.key
diff --git a/rpkid/biz-certs/Dave-Root.req b/scripts/biz-certs/Dave-Root.req
index 5c16b134..5c16b134 100644
--- a/rpkid/biz-certs/Dave-Root.req
+++ b/scripts/biz-certs/Dave-Root.req
diff --git a/rpkid/biz-certs/Dave-Root.srl b/scripts/biz-certs/Dave-Root.srl
index 0c32cf7f..0c32cf7f 100644
--- a/rpkid/biz-certs/Dave-Root.srl
+++ b/scripts/biz-certs/Dave-Root.srl
diff --git a/rpkid/biz-certs/Elena-CA.cer b/scripts/biz-certs/Elena-CA.cer
index 41d6b730..41d6b730 100644
--- a/rpkid/biz-certs/Elena-CA.cer
+++ b/scripts/biz-certs/Elena-CA.cer
diff --git a/rpkid/biz-certs/Elena-CA.cnf b/scripts/biz-certs/Elena-CA.cnf
index e440fbbe..e440fbbe 100644
--- a/rpkid/biz-certs/Elena-CA.cnf
+++ b/scripts/biz-certs/Elena-CA.cnf
diff --git a/rpkid/biz-certs/Elena-CA.key b/scripts/biz-certs/Elena-CA.key
index 40a3c768..40a3c768 100644
--- a/rpkid/biz-certs/Elena-CA.key
+++ b/scripts/biz-certs/Elena-CA.key
diff --git a/rpkid/biz-certs/Elena-CA.req b/scripts/biz-certs/Elena-CA.req
index 5912de56..5912de56 100644
--- a/rpkid/biz-certs/Elena-CA.req
+++ b/scripts/biz-certs/Elena-CA.req
diff --git a/rpkid/biz-certs/Elena-CA.srl b/scripts/biz-certs/Elena-CA.srl
index dc63ea69..dc63ea69 100644
--- a/rpkid/biz-certs/Elena-CA.srl
+++ b/scripts/biz-certs/Elena-CA.srl
diff --git a/rpkid/biz-certs/Elena-EE.cer b/scripts/biz-certs/Elena-EE.cer
index f61b509f..f61b509f 100644
--- a/rpkid/biz-certs/Elena-EE.cer
+++ b/scripts/biz-certs/Elena-EE.cer
diff --git a/rpkid/biz-certs/Elena-EE.cnf b/scripts/biz-certs/Elena-EE.cnf
index dd343585..dd343585 100644
--- a/rpkid/biz-certs/Elena-EE.cnf
+++ b/scripts/biz-certs/Elena-EE.cnf
diff --git a/rpkid/biz-certs/Elena-EE.key b/scripts/biz-certs/Elena-EE.key
index dd05db61..dd05db61 100644
--- a/rpkid/biz-certs/Elena-EE.key
+++ b/scripts/biz-certs/Elena-EE.key
diff --git a/rpkid/biz-certs/Elena-EE.req b/scripts/biz-certs/Elena-EE.req
index b6f095a8..b6f095a8 100644
--- a/rpkid/biz-certs/Elena-EE.req
+++ b/scripts/biz-certs/Elena-EE.req
diff --git a/rpkid/biz-certs/Elena-Root.cer b/scripts/biz-certs/Elena-Root.cer
index 9cce6c19..9cce6c19 100644
--- a/rpkid/biz-certs/Elena-Root.cer
+++ b/scripts/biz-certs/Elena-Root.cer
diff --git a/rpkid/biz-certs/Elena-Root.cnf b/scripts/biz-certs/Elena-Root.cnf
index 9123fb90..9123fb90 100644
--- a/rpkid/biz-certs/Elena-Root.cnf
+++ b/scripts/biz-certs/Elena-Root.cnf
diff --git a/rpkid/biz-certs/Elena-Root.key b/scripts/biz-certs/Elena-Root.key
index 20ce11c7..20ce11c7 100644
--- a/rpkid/biz-certs/Elena-Root.key
+++ b/scripts/biz-certs/Elena-Root.key
diff --git a/rpkid/biz-certs/Elena-Root.req b/scripts/biz-certs/Elena-Root.req
index 2ed96975..2ed96975 100644
--- a/rpkid/biz-certs/Elena-Root.req
+++ b/scripts/biz-certs/Elena-Root.req
diff --git a/rpkid/biz-certs/Elena-Root.srl b/scripts/biz-certs/Elena-Root.srl
index 4c685441..4c685441 100644
--- a/rpkid/biz-certs/Elena-Root.srl
+++ b/scripts/biz-certs/Elena-Root.srl
diff --git a/rpkid/biz-certs/Frank-CA.cer b/scripts/biz-certs/Frank-CA.cer
index 278af020..278af020 100644
--- a/rpkid/biz-certs/Frank-CA.cer
+++ b/scripts/biz-certs/Frank-CA.cer
diff --git a/rpkid/biz-certs/Frank-CA.cnf b/scripts/biz-certs/Frank-CA.cnf
index 25208816..25208816 100644
--- a/rpkid/biz-certs/Frank-CA.cnf
+++ b/scripts/biz-certs/Frank-CA.cnf
diff --git a/rpkid/biz-certs/Frank-CA.key b/scripts/biz-certs/Frank-CA.key
index eecb7253..eecb7253 100644
--- a/rpkid/biz-certs/Frank-CA.key
+++ b/scripts/biz-certs/Frank-CA.key
diff --git a/rpkid/biz-certs/Frank-CA.req b/scripts/biz-certs/Frank-CA.req
index a4a5a41a..a4a5a41a 100644
--- a/rpkid/biz-certs/Frank-CA.req
+++ b/scripts/biz-certs/Frank-CA.req
diff --git a/rpkid/biz-certs/Frank-CA.srl b/scripts/biz-certs/Frank-CA.srl
index 2aacfb2b..2aacfb2b 100644
--- a/rpkid/biz-certs/Frank-CA.srl
+++ b/scripts/biz-certs/Frank-CA.srl
diff --git a/rpkid/biz-certs/Frank-EE.cer b/scripts/biz-certs/Frank-EE.cer
index 8b77940b..8b77940b 100644
--- a/rpkid/biz-certs/Frank-EE.cer
+++ b/scripts/biz-certs/Frank-EE.cer
diff --git a/rpkid/biz-certs/Frank-EE.cnf b/scripts/biz-certs/Frank-EE.cnf
index 4fa64261..4fa64261 100644
--- a/rpkid/biz-certs/Frank-EE.cnf
+++ b/scripts/biz-certs/Frank-EE.cnf
diff --git a/rpkid/biz-certs/Frank-EE.key b/scripts/biz-certs/Frank-EE.key
index 9c8c497d..9c8c497d 100644
--- a/rpkid/biz-certs/Frank-EE.key
+++ b/scripts/biz-certs/Frank-EE.key
diff --git a/rpkid/biz-certs/Frank-EE.req b/scripts/biz-certs/Frank-EE.req
index 0c2466c0..0c2466c0 100644
--- a/rpkid/biz-certs/Frank-EE.req
+++ b/scripts/biz-certs/Frank-EE.req
diff --git a/rpkid/biz-certs/Frank-Root.cer b/scripts/biz-certs/Frank-Root.cer
index 53f858ce..53f858ce 100644
--- a/rpkid/biz-certs/Frank-Root.cer
+++ b/scripts/biz-certs/Frank-Root.cer
diff --git a/rpkid/biz-certs/Frank-Root.cnf b/scripts/biz-certs/Frank-Root.cnf
index 56021ed7..56021ed7 100644
--- a/rpkid/biz-certs/Frank-Root.cnf
+++ b/scripts/biz-certs/Frank-Root.cnf
diff --git a/rpkid/biz-certs/Frank-Root.key b/scripts/biz-certs/Frank-Root.key
index ad4700e5..ad4700e5 100644
--- a/rpkid/biz-certs/Frank-Root.key
+++ b/scripts/biz-certs/Frank-Root.key
diff --git a/rpkid/biz-certs/Frank-Root.req b/scripts/biz-certs/Frank-Root.req
index 2fe82ab6..2fe82ab6 100644
--- a/rpkid/biz-certs/Frank-Root.req
+++ b/scripts/biz-certs/Frank-Root.req
diff --git a/rpkid/biz-certs/Frank-Root.srl b/scripts/biz-certs/Frank-Root.srl
index 478b2e55..478b2e55 100644
--- a/rpkid/biz-certs/Frank-Root.srl
+++ b/scripts/biz-certs/Frank-Root.srl
diff --git a/rpkid/biz-certs/Ginny-CA.cer b/scripts/biz-certs/Ginny-CA.cer
index 2fc5b926..2fc5b926 100644
--- a/rpkid/biz-certs/Ginny-CA.cer
+++ b/scripts/biz-certs/Ginny-CA.cer
diff --git a/rpkid/biz-certs/Ginny-CA.cnf b/scripts/biz-certs/Ginny-CA.cnf
index af1e067c..af1e067c 100644
--- a/rpkid/biz-certs/Ginny-CA.cnf
+++ b/scripts/biz-certs/Ginny-CA.cnf
diff --git a/rpkid/biz-certs/Ginny-CA.key b/scripts/biz-certs/Ginny-CA.key
index 281a45b8..281a45b8 100644
--- a/rpkid/biz-certs/Ginny-CA.key
+++ b/scripts/biz-certs/Ginny-CA.key
diff --git a/rpkid/biz-certs/Ginny-CA.req b/scripts/biz-certs/Ginny-CA.req
index a88f0853..a88f0853 100644
--- a/rpkid/biz-certs/Ginny-CA.req
+++ b/scripts/biz-certs/Ginny-CA.req
diff --git a/rpkid/biz-certs/Ginny-CA.srl b/scripts/biz-certs/Ginny-CA.srl
index 81c8c803..81c8c803 100644
--- a/rpkid/biz-certs/Ginny-CA.srl
+++ b/scripts/biz-certs/Ginny-CA.srl
diff --git a/rpkid/biz-certs/Ginny-EE.cer b/scripts/biz-certs/Ginny-EE.cer
index 914b2380..914b2380 100644
--- a/rpkid/biz-certs/Ginny-EE.cer
+++ b/scripts/biz-certs/Ginny-EE.cer
diff --git a/rpkid/biz-certs/Ginny-EE.cnf b/scripts/biz-certs/Ginny-EE.cnf
index 00b14052..00b14052 100644
--- a/rpkid/biz-certs/Ginny-EE.cnf
+++ b/scripts/biz-certs/Ginny-EE.cnf
diff --git a/rpkid/biz-certs/Ginny-EE.key b/scripts/biz-certs/Ginny-EE.key
index 1984ff44..1984ff44 100644
--- a/rpkid/biz-certs/Ginny-EE.key
+++ b/scripts/biz-certs/Ginny-EE.key
diff --git a/rpkid/biz-certs/Ginny-EE.req b/scripts/biz-certs/Ginny-EE.req
index 68a07f53..68a07f53 100644
--- a/rpkid/biz-certs/Ginny-EE.req
+++ b/scripts/biz-certs/Ginny-EE.req
diff --git a/rpkid/biz-certs/Ginny-Root.cer b/scripts/biz-certs/Ginny-Root.cer
index 1ff8ce43..1ff8ce43 100644
--- a/rpkid/biz-certs/Ginny-Root.cer
+++ b/scripts/biz-certs/Ginny-Root.cer
diff --git a/rpkid/biz-certs/Ginny-Root.cnf b/scripts/biz-certs/Ginny-Root.cnf
index b82a758c..b82a758c 100644
--- a/rpkid/biz-certs/Ginny-Root.cnf
+++ b/scripts/biz-certs/Ginny-Root.cnf
diff --git a/rpkid/biz-certs/Ginny-Root.key b/scripts/biz-certs/Ginny-Root.key
index 710f4817..710f4817 100644
--- a/rpkid/biz-certs/Ginny-Root.key
+++ b/scripts/biz-certs/Ginny-Root.key
diff --git a/rpkid/biz-certs/Ginny-Root.req b/scripts/biz-certs/Ginny-Root.req
index a7da99d4..a7da99d4 100644
--- a/rpkid/biz-certs/Ginny-Root.req
+++ b/scripts/biz-certs/Ginny-Root.req
diff --git a/rpkid/biz-certs/Ginny-Root.srl b/scripts/biz-certs/Ginny-Root.srl
index fe0bafc3..fe0bafc3 100644
--- a/rpkid/biz-certs/Ginny-Root.srl
+++ b/scripts/biz-certs/Ginny-Root.srl
diff --git a/rpkid/biz-certs/Harry-CA.cer b/scripts/biz-certs/Harry-CA.cer
index de4ab580..de4ab580 100644
--- a/rpkid/biz-certs/Harry-CA.cer
+++ b/scripts/biz-certs/Harry-CA.cer
diff --git a/rpkid/biz-certs/Harry-CA.cnf b/scripts/biz-certs/Harry-CA.cnf
index 903a9172..903a9172 100644
--- a/rpkid/biz-certs/Harry-CA.cnf
+++ b/scripts/biz-certs/Harry-CA.cnf
diff --git a/rpkid/biz-certs/Harry-CA.key b/scripts/biz-certs/Harry-CA.key
index 6bd1d298..6bd1d298 100644
--- a/rpkid/biz-certs/Harry-CA.key
+++ b/scripts/biz-certs/Harry-CA.key
diff --git a/rpkid/biz-certs/Harry-CA.req b/scripts/biz-certs/Harry-CA.req
index 2a52ffd2..2a52ffd2 100644
--- a/rpkid/biz-certs/Harry-CA.req
+++ b/scripts/biz-certs/Harry-CA.req
diff --git a/rpkid/biz-certs/Harry-CA.srl b/scripts/biz-certs/Harry-CA.srl
index 619637e0..619637e0 100644
--- a/rpkid/biz-certs/Harry-CA.srl
+++ b/scripts/biz-certs/Harry-CA.srl
diff --git a/rpkid/biz-certs/Harry-EE.cer b/scripts/biz-certs/Harry-EE.cer
index 5af56a72..5af56a72 100644
--- a/rpkid/biz-certs/Harry-EE.cer
+++ b/scripts/biz-certs/Harry-EE.cer
diff --git a/rpkid/biz-certs/Harry-EE.cnf b/scripts/biz-certs/Harry-EE.cnf
index 974915cc..974915cc 100644
--- a/rpkid/biz-certs/Harry-EE.cnf
+++ b/scripts/biz-certs/Harry-EE.cnf
diff --git a/rpkid/biz-certs/Harry-EE.key b/scripts/biz-certs/Harry-EE.key
index e33936f8..e33936f8 100644
--- a/rpkid/biz-certs/Harry-EE.key
+++ b/scripts/biz-certs/Harry-EE.key
diff --git a/rpkid/biz-certs/Harry-EE.req b/scripts/biz-certs/Harry-EE.req
index 23111969..23111969 100644
--- a/rpkid/biz-certs/Harry-EE.req
+++ b/scripts/biz-certs/Harry-EE.req
diff --git a/rpkid/biz-certs/Harry-Root.cer b/scripts/biz-certs/Harry-Root.cer
index acf611ac..acf611ac 100644
--- a/rpkid/biz-certs/Harry-Root.cer
+++ b/scripts/biz-certs/Harry-Root.cer
diff --git a/rpkid/biz-certs/Harry-Root.cnf b/scripts/biz-certs/Harry-Root.cnf
index 2cb2cf3e..2cb2cf3e 100644
--- a/rpkid/biz-certs/Harry-Root.cnf
+++ b/scripts/biz-certs/Harry-Root.cnf
diff --git a/rpkid/biz-certs/Harry-Root.key b/scripts/biz-certs/Harry-Root.key
index a941f9de..a941f9de 100644
--- a/rpkid/biz-certs/Harry-Root.key
+++ b/scripts/biz-certs/Harry-Root.key
diff --git a/rpkid/biz-certs/Harry-Root.req b/scripts/biz-certs/Harry-Root.req
index 405f097e..405f097e 100644
--- a/rpkid/biz-certs/Harry-Root.req
+++ b/scripts/biz-certs/Harry-Root.req
diff --git a/rpkid/biz-certs/Harry-Root.srl b/scripts/biz-certs/Harry-Root.srl
index 181c23b0..181c23b0 100644
--- a/rpkid/biz-certs/Harry-Root.srl
+++ b/scripts/biz-certs/Harry-Root.srl
diff --git a/rpkid/biz-certs/a17ff8dd.0 b/scripts/biz-certs/a17ff8dd.0
index df756426..df756426 120000
--- a/rpkid/biz-certs/a17ff8dd.0
+++ b/scripts/biz-certs/a17ff8dd.0
diff --git a/rpkid/biz-certs/b523b0af.0 b/scripts/biz-certs/b523b0af.0
index 2af1f2c8..2af1f2c8 120000
--- a/rpkid/biz-certs/b523b0af.0
+++ b/scripts/biz-certs/b523b0af.0
diff --git a/rpkid/biz-certs/c027faa7.0 b/scripts/biz-certs/c027faa7.0
index 34794f44..34794f44 120000
--- a/rpkid/biz-certs/c027faa7.0
+++ b/scripts/biz-certs/c027faa7.0
diff --git a/rpkid/biz-certs/cf3dacf7.0 b/scripts/biz-certs/cf3dacf7.0
index e2d0a776..e2d0a776 120000
--- a/rpkid/biz-certs/cf3dacf7.0
+++ b/scripts/biz-certs/cf3dacf7.0
diff --git a/rpkid/biz-certs/d9bfc7a9.0 b/scripts/biz-certs/d9bfc7a9.0
index c3647c1c..c3647c1c 120000
--- a/rpkid/biz-certs/d9bfc7a9.0
+++ b/scripts/biz-certs/d9bfc7a9.0
diff --git a/rpkid/biz-certs/dfc82c8e.0 b/scripts/biz-certs/dfc82c8e.0
index 846947ab..846947ab 120000
--- a/rpkid/biz-certs/dfc82c8e.0
+++ b/scripts/biz-certs/dfc82c8e.0
diff --git a/rpkid/biz-certs/f97c9834.0 b/scripts/biz-certs/f97c9834.0
index e6a1b1aa..e6a1b1aa 120000
--- a/rpkid/biz-certs/f97c9834.0
+++ b/scripts/biz-certs/f97c9834.0
diff --git a/rpkid/biz-certs/ff615a1f.0 b/scripts/biz-certs/ff615a1f.0
index 0d7c9e4a..0d7c9e4a 120000
--- a/rpkid/biz-certs/ff615a1f.0
+++ b/scripts/biz-certs/ff615a1f.0
diff --git a/rpkid/biz-certs/ff8832dd.0 b/scripts/biz-certs/ff8832dd.0
index af1cacc8..af1cacc8 120000
--- a/rpkid/biz-certs/ff8832dd.0
+++ b/scripts/biz-certs/ff8832dd.0
diff --git a/rpkid/rootd.cer b/scripts/rootd.cer
index 205fee80..205fee80 100644
--- a/rpkid/rootd.cer
+++ b/scripts/rootd.cer
diff --git a/rpkid/rootd.cnf b/scripts/rootd.cnf
index 1e400c04..1e400c04 100644
--- a/rpkid/rootd.cnf
+++ b/scripts/rootd.cnf
diff --git a/rpkid/rootd.key b/scripts/rootd.key
index d97fc64d..d97fc64d 100644
--- a/rpkid/rootd.key
+++ b/scripts/rootd.key
diff --git a/rpkid/rootd.sh b/scripts/rootd.sh
index 3c234855..73411a16 100644
--- a/rpkid/rootd.sh
+++ b/scripts/rootd.sh
@@ -50,22 +50,22 @@ trap "kill $rpkid" 0 1 2 3 13 15
 
 # Create a self instance
 
-time python irbe-cli.py self --action create --crl_interval 84600
+time python irbe_cli.py self --action create --crl_interval 84600
 
 # Create a business signing context, issue the necessary business cert, and set up the cert chain
 
-time python irbe-cli.py --pem_out bsc.req bsc --action create --self_id 1 --generate_keypair --signing_cert biz-certs/Bob-CA.cer
+time python irbe_cli.py --pem_out bsc.req bsc --action create --self_id 1 --generate_keypair --signing_cert biz-certs/Bob-CA.cer
 time $openssl x509 -req -in bsc.req -out bsc.cer -CA biz-certs/Bob-CA.cer -CAkey biz-certs/Bob-CA.key -CAserial biz-certs/Bob-CA.srl
-time python irbe-cli.py bsc --action set --self_id 1 --bsc_id 1 --signing_cert bsc.cer
+time python irbe_cli.py bsc --action set --self_id 1 --bsc_id 1 --signing_cert bsc.cer
 rm -f bsc.req bsc.cer
 
 # Create a repository context
 
-time python irbe-cli.py repository --self_id 1 --action create --bsc_id 1
+time python irbe_cli.py repository --self_id 1 --action create --bsc_id 1
 
 # Create a parent context pointing at rootd.py
 
-time python irbe-cli.py parent --self_id 1 --action create --bsc_id 1 --repository_id 1 \
+time python irbe_cli.py parent --self_id 1 --action create --bsc_id 1 --repository_id 1 \
     --peer_contact_uri https://localhost:44333/ \
     --cms_ta biz-certs/Elena-Root.cer \
     --https_ta biz-certs/Elena-Root.cer \
@@ -75,7 +75,7 @@ time python irbe-cli.py parent --self_id 1 --action create --bsc_id 1 --reposito
 
 # Create a child context
 
-time python irbe-cli.py child --self_id 1 --action create --bsc_id 1 --cms_ta biz-certs/Frank-Root.cer
+time python irbe_cli.py child --self_id 1 --action create --bsc_id 1 --cms_ta biz-certs/Frank-Root.cer
 
 # Need to link irdb to created child and clear conflicting links.
 # For now, just do this "manually" in MySQL CLI.
diff --git a/rpkid/test-pow-cms.py b/scripts/test-pow-cms.py
index f7acc912..f7acc912 100644
--- a/rpkid/test-pow-cms.py
+++ b/scripts/test-pow-cms.py
diff --git a/rpkid/test-pow-tls.py b/scripts/test-pow-tls.py
index bc9ea9a0..bc9ea9a0 100644
--- a/rpkid/test-pow-tls.py
+++ b/scripts/test-pow-tls.py
diff --git a/rpkid/testpoke.sh b/scripts/testpoke.sh
index 6e6a0b74..6e6a0b74 100644
--- a/rpkid/testpoke.sh
+++ b/scripts/testpoke.sh