Enforcing naming rules in the Arbiter.
Tidy up Arbiter code.
Increase time allowed for initialisation.