removed *Arguments from broker
renamed instances and references of PluginBroker from Plugin (p) to Broker (b)