Fixing errors around naming conventions, also editing IoC, to cut out re-initialization of instances after they have already been fired off.