From: Roland Häder <roland@mxchange.org>
Date: Tue, 10 May 2022 23:03:48 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=296b49489c8a4e633f9308f4c7280b20db39041e;p=hub.git

Continued:
- Are we invoking methods or are we calling them?

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/application/hub/classes/container/socket/class_SocketContainer.php b/application/hub/classes/container/socket/class_SocketContainer.php
index fca7dd3a7..43cebca34 100644
--- a/application/hub/classes/container/socket/class_SocketContainer.php
+++ b/application/hub/classes/container/socket/class_SocketContainer.php
@@ -748,7 +748,7 @@ class SocketContainer extends BaseHubContainer implements StorableSocket, Visita
 		$excepts = [];
 
 		// Check if we have some peers left
-		/* EXTREME-NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-SOCKET: Calling socket_select(%d,%d,%d,0%d) ...', strtoupper($this->getSocketProtocol()), count($readers), count($writers), count($excepts), self::$configEntries['socket_select_timeout']));
+		/* EXTREME-NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-SOCKET: Invoking socket_select(%d,%d,%d,0%d) ...', strtoupper($this->getSocketProtocol()), count($readers), count($writers), count($excepts), self::$configEntries['socket_select_timeout']));
 		$left = socket_select(
 			$readers,
 			$writers,
diff --git a/application/hub/classes/database/frontend/node_dht/class_NodeDistributedHashTableDatabaseFrontend.php b/application/hub/classes/database/frontend/node_dht/class_NodeDistributedHashTableDatabaseFrontend.php
index dda53a626..a58f23511 100644
--- a/application/hub/classes/database/frontend/node_dht/class_NodeDistributedHashTableDatabaseFrontend.php
+++ b/application/hub/classes/database/frontend/node_dht/class_NodeDistributedHashTableDatabaseFrontend.php
@@ -266,7 +266,7 @@ class NodeDistributedHashTableDatabaseFrontend extends BaseHubDatabaseFrontend i
 		$dataSetInstance = $this->prepareLocalDataSetInstance();
 
 		// "Insert" this dataset instance completely into the database
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DHT-FRONTEND: Calling this->queryInsertDataSet(' . $dataSetInstance->__toString() . ') ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DHT-FRONTEND: Invoking this->queryInsertDataSet(' . $dataSetInstance->__toString() . ') ...');
 		$this->queryInsertDataSet($dataSetInstance);
 
 		// Debug message
@@ -625,7 +625,7 @@ class NodeDistributedHashTableDatabaseFrontend extends BaseHubDatabaseFrontend i
 	 */
 	public function removeNonPublicDataFromArray(array $data) {
 		// Currently call only inner method
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DHT-FRONTEND: Calling parent::removeNonPublicDataFromArray(data) ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DHT-FRONTEND: Invoking parent::removeNonPublicDataFromArray(data) ...');
 		$data = parent::removeNonPublicDataFromArray($data);
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DHT-FRONTEND: data[]=' . gettype($data));
 
diff --git a/application/hub/classes/database/frontend/node_information/class_NodeInformationDatabaseFrontend.php b/application/hub/classes/database/frontend/node_information/class_NodeInformationDatabaseFrontend.php
index b1ab7c28f..f843bf4ed 100644
--- a/application/hub/classes/database/frontend/node_information/class_NodeInformationDatabaseFrontend.php
+++ b/application/hub/classes/database/frontend/node_information/class_NodeInformationDatabaseFrontend.php
@@ -184,7 +184,7 @@ class NodeInformationDatabaseFrontend extends BaseHubDatabaseFrontend implements
 	 */
 	public function removeNonPublicDataFromArray(array $data) {
 		// Currently call only inner method
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE-FRONTEND: Calling parent::removeNonPublicDataFromArray(data) ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE-FRONTEND: Invoking parent::removeNonPublicDataFromArray(data) ...');
 		$data = parent::removeNonPublicDataFromArray($data);
 
 		// Return cleaned data
diff --git a/application/hub/classes/decoder/package/class_PackageDecoder.php b/application/hub/classes/decoder/package/class_PackageDecoder.php
index 4efb6bd81..681b61cb4 100644
--- a/application/hub/classes/decoder/package/class_PackageDecoder.php
+++ b/application/hub/classes/decoder/package/class_PackageDecoder.php
@@ -121,7 +121,7 @@ class PackageDecoder extends BaseDecoder implements Decodeable, Registerable {
 		$discoveryInstance = PackageDiscoveryFactory::createPackageDiscoveryInstance();
 
 		// ... then disover all recipient (might be only one), this package may shall be forwarded
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('PACKAGE-DECODER: Calling discoveryInstance->discoverRawRecipients(%s) ...', $packageInstance->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('PACKAGE-DECODER: Invoking discoveryInstance->discoverRawRecipients(%s) ...', $packageInstance->__toString()));
 		$discoveryInstance->discoverRawRecipients($packageInstance);
 
 		// Check for 'recipient' field (the 'sender' field and others are ignored here)
diff --git a/application/hub/classes/dht/class_BaseDht.php b/application/hub/classes/dht/class_BaseDht.php
index 5b562ae3f..f020cfb4f 100644
--- a/application/hub/classes/dht/class_BaseDht.php
+++ b/application/hub/classes/dht/class_BaseDht.php
@@ -265,7 +265,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable {
 		assert(is_array($entry));
 
 		// Remove any non-public data the database layer desires
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-DHT: Calling this->getFrontendInstance()->removeNonPublicDataFromArray(data) ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-DHT: Invoking this->getFrontendInstance()->removeNonPublicDataFromArray(data) ...');
 		$entry = $this->getFrontendInstance()->removeNonPublicDataFromArray($entry);
 		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-DHT: entry[]=' . gettype($entry));
 
@@ -276,7 +276,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable {
 		$this->publishHelperInstance->getTemplateInstance()->assignMultipleVariables($entry);
 
 		// "Publish" the descriptor by sending it to the bootstrap/list nodes
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-DHT: Calling this->publishHelperInstance->sendPackage(' . $this->__toString() . ') ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-DHT: Invoking this->publishHelperInstance->sendPackage(' . $this->__toString() . ') ...');
 		$this->publishHelperInstance->sendPackage($this);
 	}
 
diff --git a/application/hub/classes/dht/node/class_NodeDhtFacade.php b/application/hub/classes/dht/node/class_NodeDhtFacade.php
index e6b8ad331..3f5a73ae8 100644
--- a/application/hub/classes/dht/node/class_NodeDhtFacade.php
+++ b/application/hub/classes/dht/node/class_NodeDhtFacade.php
@@ -155,7 +155,7 @@ class NodeDhtFacade extends BaseDht implements DistributableNode, Registerable {
 		$helperInstance->getTemplateInstance()->compileConfigInVariables();
 
 		// "Publish" the descriptor by sending it to the bootstrap/list nodes
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NODE-DHT-FACADE: Calling helperInstance->sendPackage(%s) ...', $this->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NODE-DHT-FACADE: Invoking helperInstance->sendPackage(%s) ...', $this->__toString()));
 		$helperInstance->sendPackage($this);
 
 		// Change state
diff --git a/application/hub/classes/discovery/recipient/package/class_PackageRecipientDiscovery.php b/application/hub/classes/discovery/recipient/package/class_PackageRecipientDiscovery.php
index c658250d4..eeb409830 100644
--- a/application/hub/classes/discovery/recipient/package/class_PackageRecipientDiscovery.php
+++ b/application/hub/classes/discovery/recipient/package/class_PackageRecipientDiscovery.php
@@ -85,7 +85,7 @@ class PackageRecipientDiscovery extends BaseRecipientDiscovery implements Discov
 			));
 
 			// Try to solve it
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('RECIPIENT-DISCOVERY: Calling recipientInstance->resolveRecipientByPackageInstance(%s, %s) ...', $packageInstance->__toString(), $this->getListInstance()->__toString()));
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('RECIPIENT-DISCOVERY: Invoking recipientInstance->resolveRecipientByPackageInstance(%s, %s) ...', $packageInstance->__toString(), $this->getListInstance()->__toString()));
 			$recipientInstance->resolveRecipientByPackageInstance($packageInstance, $this->getListInstance());
 		} catch (FrameworkException $e) {
 			// Could not find class, what ever failed
diff --git a/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php b/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
index 31e92942b..8ecb5c2bb 100644
--- a/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
+++ b/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
@@ -117,7 +117,7 @@ class PackageSocketDiscovery extends BaseRecipientDiscovery implements Discovera
 			assert($listenerInstance instanceof Listenable);
 
 			// Trace message
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('PACKAGE-SOCKET-DISCOVERY: Calling listenerInstance->ifListenerAcceptsPackageData(%s) ...', $packageInstance->__toString()));
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('PACKAGE-SOCKET-DISCOVERY: Invoking listenerInstance->ifListenerAcceptsPackageData(%s) ...', $packageInstance->__toString()));
 
 			// Does the listener want that package?
 			if ($listenerInstance->ifListenerAcceptsPackageData($packageInstance)) {
diff --git a/application/hub/classes/handler/data/class_BaseDataHandler.php b/application/hub/classes/handler/data/class_BaseDataHandler.php
index ec345845f..69ea15ecb 100644
--- a/application/hub/classes/handler/data/class_BaseDataHandler.php
+++ b/application/hub/classes/handler/data/class_BaseDataHandler.php
@@ -113,7 +113,7 @@ abstract class BaseDataHandler extends BaseHubHandler implements HubInterface {
 		$helperInstance->getTemplateInstance()->compileConfigInVariables();
 
 		// Deliver the package
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-DATA-HANDLER: Calling helperInstance->sendPackage(%s) ...', $nodeInstance->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-DATA-HANDLER: Invoking helperInstance->sendPackage(%s) ...', $nodeInstance->__toString()));
 		$helperInstance->sendPackage($nodeInstance);
 
 		// Debug message
@@ -144,7 +144,7 @@ abstract class BaseDataHandler extends BaseHubHandler implements HubInterface {
 		$helperInstance->getTemplateInstance()->compileConfigInVariables();
 
 		// Deliver the package
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NODE-DHT-FACADE: Calling helperInstance->sendPackage(%s) ...', $nodeInstance->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NODE-DHT-FACADE: Invoking helperInstance->sendPackage(%s) ...', $nodeInstance->__toString()));
 		$helperInstance->sendPackage($nodeInstance);
 
 		// Debug message
diff --git a/application/hub/classes/handler/package/class_NetworkPackageHandler.php b/application/hub/classes/handler/package/class_NetworkPackageHandler.php
index b3951ece2..f88f4f159 100644
--- a/application/hub/classes/handler/package/class_NetworkPackageHandler.php
+++ b/application/hub/classes/handler/package/class_NetworkPackageHandler.php
@@ -634,7 +634,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei
 		 * shall be delivered has already been added for all entries from the
 		 * list.
 		 */
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-HANDLER: Calling discoveryInstance->clearRecipients() ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-HANDLER: Invoking discoveryInstance->clearRecipients() ...');
 		$discoveryInstance->clearRecipients();
 
 		// Trace message
@@ -678,7 +678,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei
 		$infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($helperInstance->getProtocolName(), 'helper');
 
 		// Will the info instance with connection helper data
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Calling infoInstance->fillWithConnectionHelperInformation(%s) ...', $helperInstance->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Invoking infoInstance->fillWithConnectionHelperInformation(%s) ...', $helperInstance->__toString()));
 		$infoInstance->fillWithConnectionHelperInformation($helperInstance);
 
 		// Is it not there?
@@ -696,11 +696,11 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei
 		}
 
 		// Make sure the connection is up
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-HANDLER: Calling helperInstance->stateInstance->validatePeerStateConnected() ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-HANDLER: Invoking helperInstance->stateInstance->validatePeerStateConnected() ...');
 		$helperInstance->getStateInstance()->validatePeerStateConnected();
 
 		// Enqueue it again on the out-going queue, the connection is up and working at this point
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Calling this->stackInstance->pushNamed(%s, %s) ...', self::STACKER_NAME_OUTGOING, $packageInstance->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Invoking this->stackInstance->pushNamed(%s, %s) ...', self::STACKER_NAME_OUTGOING, $packageInstance->__toString()));
 		$this->getStackInstance()->pushNamed(self::STACKER_NAME_OUTGOING, $packageInstance);
 
 		// Trace message
@@ -1134,7 +1134,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei
 		$encodedDataArray[self::RAW_INDEX_SOCKET_INSTANCE] = NULL;
 
 		// And deliver it
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Calling socketInstance->writeBufferToSocketByArray(%d,%d) ...', count($encodedDataArray), $sentBytes));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Invoking socketInstance->writeBufferToSocketByArray(%d,%d) ...', count($encodedDataArray), $sentBytes));
 		if (!$socketInstance->writeBufferToSocketByArray($encodedDataArray, $sentBytes)) {
 			// Something bad happened while writing to socket
 			$socketInstance->handleSocketError(__METHOD__, __LINE__);
@@ -1189,7 +1189,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei
 	 */
 	public function isNewRawDataPending () {
 		// Visit the pool. This monitors the pool for incoming raw data.
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Calling this->getListenerPoolInstance()->accept(%s) ... - CALLED!', $this->getVisitorInstance()));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Invoking this->getListenerPoolInstance()->accept(%s) ... - CALLED!', $this->getVisitorInstance()));
 		$this->getListenerPoolInstance()->accept($this->getVisitorInstance());
 
 		// Check for new data arrival
@@ -1312,7 +1312,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei
 	 */
 	public function handleAssemblerPendingData () {
 		// Handle it
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-HANDLER: Calling this->getAssemblerInstance()->handlePendingData() ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-HANDLER: Invoking this->getAssemblerInstance()->handlePendingData() ...');
 		$this->getAssemblerInstance()->handlePendingData();
 	}
 
@@ -1323,7 +1323,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei
 	 */
 	public function handleMultipleMessages () {
 		// Handle it
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-HANDLER: Calling this->getAssemblerInstance()->handleMultipleMessages() ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-HANDLER: Invoking this->getAssemblerInstance()->handleMultipleMessages() ...');
 		$this->getAssemblerInstance()->handleMultipleMessages();
 	}
 
diff --git a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
index 6350345a2..896fddb24 100644
--- a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
+++ b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
@@ -355,7 +355,7 @@ abstract class BaseConnectionHelper extends BaseHubSystemHelper implements Visit
 		}
 
 		// Was some raw data been collected?
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CONNECTION-HELPER: rawData()=%d - after loop ...', strlen($rawData)));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CONNECTION-HELPER: rawData()=%d - after loop ...', gettype($rawData), strlen($rawData)));
 		if (empty($rawData)) {
 			// That should not happen
 			throw new LogicException('rawData should not be empty at this point.');
@@ -365,7 +365,7 @@ abstract class BaseConnectionHelper extends BaseHubSystemHelper implements Visit
 		$bufferSize = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($this->getProtocolName() . '_buffer_length');
 
 		// Encode the raw data with our output-stream
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CONNECTION-HELPER: bufferSize=%d, socketResource[%s]=%s', $bufferSize, gettype($this->getSocketInstance()->getSocketResource()), $this->getSocketInstance()->getSocketResource()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CONNECTION-HELPER: bufferSize=%d,rawData()=%d, socketResource[%s]=%s', $bufferSize, strlen($rawData), gettype($this->getSocketInstance()->getSocketResource()), $this->getSocketInstance()->getSocketResource()));
 		$encodedDataArray = [
 			NetworkPackageHandler::RAW_INDEX_FINAL_HASH      => $this->currentFinalHash,
 			NetworkPackageHandler::RAW_INDEX_ENCODED_DATA    => $this->getOutputStreamInstance()->streamData($rawData),
diff --git a/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php b/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php
index a600362ad..5deda8a3b 100644
--- a/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php
+++ b/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php
@@ -109,7 +109,7 @@ class NodeSelfConnectHelper extends BaseNodeHelper implements HelpableNode {
 		$handlerInstance = NetworkPackageHandlerFactory::createNetworkPackageHandlerInstance();
 
 		// Next, feed the content in. The network package class is a pipe-through class.
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE-SELF-CONNECT-HELPER: Calling handlerInstance->enqueueRawDataFromTemplate(' . $this->__toString() . ') ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE-SELF-CONNECT-HELPER: Invoking handlerInstance->enqueueRawDataFromTemplate(' . $this->__toString() . ') ...');
 		$handlerInstance->enqueueRawDataFromTemplate($this);
 
 		// Trace message
diff --git a/application/hub/classes/info/connection/class_ConnectionInfo.php b/application/hub/classes/info/connection/class_ConnectionInfo.php
index 4b6557bfb..723868ecb 100644
--- a/application/hub/classes/info/connection/class_ConnectionInfo.php
+++ b/application/hub/classes/info/connection/class_ConnectionInfo.php
@@ -205,7 +205,7 @@ class ConnectionInfo extends BaseInfo implements ShareableInfo, Registerable {
 		$socketPort    = 0;
 
 		// Get peer name
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CONNECTION-INFO: Calling socketInstance->determineSocketPeerName(%s,%d) ...', $socketAddress, $socketPort));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CONNECTION-INFO: Invoking socketInstance->determineSocketPeerName(%s,%d) ...', $socketAddress, $socketPort));
 		if (!$socketInstance->determineSocketPeerName($socketAddress, $socketPort)) {
 			// Did not work
 			throw new InvalidSocketException(array($this, $socketInstance->getSocketResource()), self::EXCEPTION_INVALID_SOCKET);
diff --git a/application/hub/classes/listener/class_BaseListener.php b/application/hub/classes/listener/class_BaseListener.php
index d73588837..689bc3837 100644
--- a/application/hub/classes/listener/class_BaseListener.php
+++ b/application/hub/classes/listener/class_BaseListener.php
@@ -413,7 +413,7 @@ abstract class BaseListener extends BaseHubSystem implements Visitable {
 		}
 
 		// Will the info instance with listener data
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-LISTENER: Calling infoInstance->fillWithSocketPeerInformation(%s) ...', strtoupper($this->getProtocolName()), $socketInstance->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-LISTENER: Invoking infoInstance->fillWithSocketPeerInformation(%s) ...', strtoupper($this->getProtocolName()), $socketInstance->__toString()));
 		$infoInstance->fillWithSocketPeerInformation($socketInstance);
 
 		// Init peer address/port
@@ -437,7 +437,7 @@ abstract class BaseListener extends BaseHubSystem implements Visitable {
 		$this->getRegistryInstance()->registerSocketInstance($infoInstance, $socketInstance);
 
 		// Invoke private method
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-LISTENER: Calling this->handleIncomingSocket(%s) ...', strtoupper($this->getProtocolName()), $socketInstance->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-LISTENER: Invoking this->handleIncomingSocket(%s) ...', strtoupper($this->getProtocolName()), $socketInstance->__toString()));
 		$this->handleIncomingSocket($socketInstance);
 
 		// Trace message
diff --git a/application/hub/classes/listener/class_BaseListenerDecorator.php b/application/hub/classes/listener/class_BaseListenerDecorator.php
index 06103e93e..c1c156e9e 100644
--- a/application/hub/classes/listener/class_BaseListenerDecorator.php
+++ b/application/hub/classes/listener/class_BaseListenerDecorator.php
@@ -85,7 +85,7 @@ abstract class BaseListenerDecorator extends BaseDecorator implements Visitable
 	 */
 	public final function getListenAddress () {
 		// Trace message
-		//* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(strtoupper($this->getProtocolName()) . '-LISTENER-DECORATOR: Calling this->getListenerInstance()->getListenAddress() ...');
+		//* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(strtoupper($this->getProtocolName()) . '-LISTENER-DECORATOR: Invoking this->getListenerInstance()->getListenAddress() ...');
 		return $this->getListenerInstance()->getListenAddress();
 	}
 
@@ -96,7 +96,7 @@ abstract class BaseListenerDecorator extends BaseDecorator implements Visitable
 	 */
 	public final function getListenPort () {
 		// Trace message
-		//* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(strtoupper($this->getProtocolName()) . '-LISTENER-DECORATOR: Calling this->getListenerInstance()->getListenPort() ...');
+		//* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(strtoupper($this->getProtocolName()) . '-LISTENER-DECORATOR: Invoking this->getListenerInstance()->getListenPort() ...');
 		return $this->getListenerInstance()->getListenPort();
 	}
 
@@ -114,7 +114,7 @@ abstract class BaseListenerDecorator extends BaseDecorator implements Visitable
 		$visitorInstance->visitDecorator($this);
 
 		// Trace message
-		//* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-LISTENER-DECORATOR: Calling visitorInstance->visitListener(%s) ...', strtoupper($this->getProtocolName()), $this->getListenerInstance()->__toString()));
+		//* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-LISTENER-DECORATOR: Invoking visitorInstance->visitListener(%s) ...', strtoupper($this->getProtocolName()), $this->getListenerInstance()->__toString()));
 
 		// Visit the covered class
 		$visitorInstance->visitListener($this->getListenerInstance());
diff --git a/application/hub/classes/listener/socket/class_SocketFileListener.php b/application/hub/classes/listener/socket/class_SocketFileListener.php
index ec370fa87..32863225b 100644
--- a/application/hub/classes/listener/socket/class_SocketFileListener.php
+++ b/application/hub/classes/listener/socket/class_SocketFileListener.php
@@ -109,7 +109,7 @@ class SocketFileListener extends BaseListener implements Listenable {
 	 */
 	public function doListen() {
 		// Trace message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FILE-LISTENER: Calling this->doListenSocketSelect() ... - CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FILE-LISTENER: Invoking this->doListenSocketSelect() ... - CALLED!');
 
 		// Call super method
 		$this->doListenSocketSelect('');
diff --git a/application/hub/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php b/application/hub/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
index c6e3acae9..a46c44a8f 100644
--- a/application/hub/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
+++ b/application/hub/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
@@ -81,7 +81,7 @@ class SocketFileListenerDecorator extends BaseListenerDecorator implements Liste
 	 */
 	public function doListen () {
 		// Trace message
-		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FILE-LISTENER: Calling this->getListenerInstance()->doListen() ...');
+		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FILE-LISTENER: Invoking this->getListenerInstance()->doListen() ...');
 
 		// Handle generic TCP package
 		$this->getListenerInstance()->doListen();
@@ -98,7 +98,7 @@ class SocketFileListenerDecorator extends BaseListenerDecorator implements Liste
 	 */
 	public function ifListenerAcceptsPackageData (DeliverablePackage $packageInstance) {
 		// Debug message
-		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FILE-LISTENER: Calling this->getListenerInstance()->ifListenerAcceptsPackageData() ...');
+		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FILE-LISTENER: Invoking this->getListenerInstance()->ifListenerAcceptsPackageData() ...');
 
 		// Call inner method, no decoration is wanted in this method
 		return $this->getListenerInstance()->ifListenerAcceptsPackageData($packageInstance);
diff --git a/application/hub/classes/listener/tcp/class_TcpListener.php b/application/hub/classes/listener/tcp/class_TcpListener.php
index 514612d08..4ce47c346 100644
--- a/application/hub/classes/listener/tcp/class_TcpListener.php
+++ b/application/hub/classes/listener/tcp/class_TcpListener.php
@@ -105,7 +105,7 @@ class TcpListener extends BaseListener implements Listenable {
 	 */
 	public function doListen () {
 		// Trace message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TCP-LISTENER: Calling this->doListenSocketSelect() ... - CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TCP-LISTENER: Invoking this->doListenSocketSelect() ... - CALLED!');
 
 		// Call super method
 		$this->doListenSocketSelect();
diff --git a/application/hub/classes/listener/tcp/decorators/class_ClientTcpListenerDecorator.php b/application/hub/classes/listener/tcp/decorators/class_ClientTcpListenerDecorator.php
index c792eaaa7..5602de7a6 100644
--- a/application/hub/classes/listener/tcp/decorators/class_ClientTcpListenerDecorator.php
+++ b/application/hub/classes/listener/tcp/decorators/class_ClientTcpListenerDecorator.php
@@ -81,7 +81,7 @@ class ClientTcpListenerDecorator extends BaseListenerDecorator implements Listen
 	 */
 	public function doListen () {
 		// Trace message
-		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CLIENT-TCP-LISTENER: Calling this->getListenerInstance() ...');
+		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CLIENT-TCP-LISTENER: Invoking this->getListenerInstance() ...');
 
 		// Handle generic TCP package
 		$this->getListenerInstance()->doListen();
diff --git a/application/hub/classes/listener/tcp/decorators/class_HubTcpListenerDecorator.php b/application/hub/classes/listener/tcp/decorators/class_HubTcpListenerDecorator.php
index 080774f81..919638cdc 100644
--- a/application/hub/classes/listener/tcp/decorators/class_HubTcpListenerDecorator.php
+++ b/application/hub/classes/listener/tcp/decorators/class_HubTcpListenerDecorator.php
@@ -81,7 +81,7 @@ class HubTcpListenerDecorator extends BaseListenerDecorator implements Listenabl
 	 */
 	public function doListen () {
 		// Trace message
-		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-TCP-LISTENER: Calling this->getListenerInstance() ...');
+		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-TCP-LISTENER: Invoking this->getListenerInstance() ...');
 
 		// Handle generic TCP package
 		$this->getListenerInstance()->doListen();
diff --git a/application/hub/classes/listener/udp/class_UdpListener.php b/application/hub/classes/listener/udp/class_UdpListener.php
index 79b2f662b..025f71a48 100644
--- a/application/hub/classes/listener/udp/class_UdpListener.php
+++ b/application/hub/classes/listener/udp/class_UdpListener.php
@@ -107,7 +107,7 @@ class UdpListener extends BaseListener implements Listenable {
 	 */
 	public function doListen () {
 		// Trace message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('UDP-LISTENER: Calling this->doListenSocketSelect() ... - CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('UDP-LISTENER: Invoking this->doListenSocketSelect() ... - CALLED!');
 
 		// Call super method
 		$this->doListenSocketSelect();
diff --git a/application/hub/classes/listener/udp/decorators/class_ClientUdpListenerDecorator.php b/application/hub/classes/listener/udp/decorators/class_ClientUdpListenerDecorator.php
index f69614e1e..901512d99 100644
--- a/application/hub/classes/listener/udp/decorators/class_ClientUdpListenerDecorator.php
+++ b/application/hub/classes/listener/udp/decorators/class_ClientUdpListenerDecorator.php
@@ -81,7 +81,7 @@ class ClientUdpListenerDecorator extends BaseListenerDecorator implements Listen
 	 */
 	public function doListen () {
 		// Trace message
-		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CLIENT-UDP-LISTENER: Calling this->getListenerInstance() ...');
+		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CLIENT-UDP-LISTENER: Invoking this->getListenerInstance() ...');
 
 		// Handle generic UDP packages first
 		$this->getListenerInstance()->doListen();
diff --git a/application/hub/classes/listener/udp/decorators/class_HubUdpListenerDecorator.php b/application/hub/classes/listener/udp/decorators/class_HubUdpListenerDecorator.php
index 5b0dda701..a21120572 100644
--- a/application/hub/classes/listener/udp/decorators/class_HubUdpListenerDecorator.php
+++ b/application/hub/classes/listener/udp/decorators/class_HubUdpListenerDecorator.php
@@ -81,7 +81,7 @@ class HubUdpListenerDecorator extends BaseListenerDecorator implements Listenabl
 	 */
 	public function doListen () {
 		// Trace message
-		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-UDP-LISTENER: Calling this->getListenerInstance() ...');
+		/* NOSY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-UDP-LISTENER: Invoking this->getListenerInstance() ...');
 
 		// Handle generic UDP package first
 		$this->getListenerInstance()->doListen();
diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index e901e8f38..ea97f3c5a 100644
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -451,7 +451,7 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC
 				 * "tables". This allows a smooth update for the underlaying
 				 * database table.
 				 */
-				/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-HUB-NODE: Calling this->generatePrivateKeyAndHash(%s) ...', $this->getSearchInstance()->__toString()));
+				/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-HUB-NODE: Invoking this->generatePrivateKeyAndHash(%s) ...', $this->getSearchInstance()->__toString()));
 				$this->generatePrivateKeyAndHash($this->getSearchInstance());
 			} else {
 				// Get the node id from result and set it
@@ -583,7 +583,7 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC
 		$helperInstance->getTemplateInstance()->compileConfigInVariables();
 
 		// "Publish" the descriptor by sending it to the bootstrap/list nodes
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-HUB-NODE: Calling helperInstance->sendPackage(%s) ...', $this->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-HUB-NODE: Invoking helperInstance->sendPackage(%s) ...', $this->__toString()));
 		$helperInstance->sendPackage($this);
 
 		// Change the state, this should be the last line except debug output
@@ -615,7 +615,7 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC
 		$helperInstance->getTemplateInstance()->compileConfigInVariables();
 
 		// And send the package away
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-HUB-NODE: Calling helperInstance->sendPackage(%s) ...', $this->__toString()));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-HUB-NODE: Invoking helperInstance->sendPackage(%s) ...', $this->__toString()));
 		$helperInstance->sendPackage($this);
 
 		// Debug output
diff --git a/application/hub/classes/recipient/dht/class_DhtRecipient.php b/application/hub/classes/recipient/dht/class_DhtRecipient.php
index cd7b71dcc..2026a1754 100644
--- a/application/hub/classes/recipient/dht/class_DhtRecipient.php
+++ b/application/hub/classes/recipient/dht/class_DhtRecipient.php
@@ -101,7 +101,7 @@ class DhtRecipient extends BaseRecipient implements Recipient {
 			}
 
 			// Add it to the list
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('DHT-RECIPIENT: Calling listInstance->addEntry(%s) ...', $recipient[NodeDistributedHashTableDatabaseFrontend::DB_COLUMN_EXTERNAL_ADDRESS]));
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('DHT-RECIPIENT: Invoking listInstance->addEntry(%s) ...', $recipient[NodeDistributedHashTableDatabaseFrontend::DB_COLUMN_EXTERNAL_ADDRESS]));
 			$listInstance->addEntry('unl', $recipient[NodeDistributedHashTableDatabaseFrontend::DB_COLUMN_EXTERNAL_ADDRESS]);
 		}
 
diff --git a/application/hub/classes/registry/socket/class_SocketRegistry.php b/application/hub/classes/registry/socket/class_SocketRegistry.php
index 73f6f0ef9..19c5980c4 100644
--- a/application/hub/classes/registry/socket/class_SocketRegistry.php
+++ b/application/hub/classes/registry/socket/class_SocketRegistry.php
@@ -307,7 +307,7 @@ class SocketRegistry extends BaseRegistry implements Register, RegisterableSocke
 						$infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($listenerInstance->getProtocolName(), 'helper');
 
 						// Fill info instance with listener data
-						/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('SOCKET-REGISTRY: key=%s,subKey=%s: Calling infoInstance->fillWithListenerInformation(%s) ...', $key, $subKey, $listenerInstance->__toString()));
+						/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('SOCKET-REGISTRY: key=%s,subKey=%s: Invoking infoInstance->fillWithListenerInformation(%s) ...', $key, $subKey, $listenerInstance->__toString()));
 						$infoInstance->fillWithListenerInformation($listenerInstance);
 					} elseif ($helperInstance instanceof ConnectionHelper) {
 						// Found a helper, so get the info instance first
@@ -315,7 +315,7 @@ class SocketRegistry extends BaseRegistry implements Register, RegisterableSocke
 						$infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($helperInstance->getProtocolName(), 'helper');
 
 						// Helper is found
-						/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('SOCKET-REGISTRY: key=%s,subKey=%s: Calling infoInstance->fillWithHelperInformation(%s) ...', $key, $subKey, $helperInstance->__toString()));
+						/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('SOCKET-REGISTRY: key=%s,subKey=%s: Invoking infoInstance->fillWithHelperInformation(%s) ...', $key, $subKey, $helperInstance->__toString()));
 						$infoInstance->fillWithConnectionHelperInformation($helperInstance);
 					} else {
 						// Not supported state!
diff --git a/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php b/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
index 7a5bf1a88..ce3a18f58 100644
--- a/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
+++ b/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
@@ -376,14 +376,14 @@ class CrawlerUploadedListUrlSource extends BaseUrlSource implements UrlSource, R
 			 * A CSV file has been found and "imported" (added to stack). Now
 			 * the file can be read line by line and checked every one of it.
 			 */
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: Calling this->parseCsvEntry() ...');
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: Invoking this->parseCsvEntry() ...');
 			$this->parseCsvEntry();
 		} elseif ($this->isCsvFileAdded()) {
 			/*
 			 * A CSV file has been found and "imported" (added to stack). Now
 			 * the file can be read line by line and checked every one of it.
 			 */
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: Calling this->parseCsvFile() ...');
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: Invoking this->parseCsvFile() ...');
 			$this->parseCsvFile();
 		} elseif ($this->isCsvFileFound() && !$this->isLastCsvFileImported()) {
 			/*
@@ -391,7 +391,7 @@ class CrawlerUploadedListUrlSource extends BaseUrlSource implements UrlSource, R
 			 * CSV-like as you may wish to provide meta data such as crawl
 			 * depth, handling of 3rd-party URLs and such.
 			 */
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: Calling this->addCsvFile() ...');
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: Invoking this->addCsvFile() ...');
 			$this->addCsvFile();
 		}
 
diff --git a/application/hub/classes/states/miner/booting/class_MinerBootingState.php b/application/hub/classes/states/miner/booting/class_MinerBootingState.php
index a270efc11..a86861b42 100644
--- a/application/hub/classes/states/miner/booting/class_MinerBootingState.php
+++ b/application/hub/classes/states/miner/booting/class_MinerBootingState.php
@@ -74,7 +74,7 @@ class MinerBootingState extends BaseMinerState implements Stateable {
 		}
 
 		// Debug message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MINER-STATE: Calling prepareBlockProduction() on ' . $executorInstance->__toString() . ' ...');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('MINER-STATE: Invoking executorInstance->prepareBlockProduction(%s) ...', $executorInstance->__toString()));
 
 		// Now prepare the unit production to maybe become 'virgin' or 'active' if work/test units are there
 		$executorInstance->prepareBlockProduction($this);
diff --git a/application/hub/classes/tasks/network/class_NetworkPackageReaderTask.php b/application/hub/classes/tasks/network/class_NetworkPackageReaderTask.php
index d70889db3..f0ca8858d 100644
--- a/application/hub/classes/tasks/network/class_NetworkPackageReaderTask.php
+++ b/application/hub/classes/tasks/network/class_NetworkPackageReaderTask.php
@@ -95,7 +95,7 @@ class NetworkPackageReaderTask extends BaseHubTask implements Taskable, Visitabl
 			 * "interpreted". This is done by trying to find a configuration
 			 * entry based on 'message_type' element.
 			 */
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Calling handlerInstance->handleProcessedMessage() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Invoking handlerInstance->handleProcessedMessage() ...');
 			$handlerInstance->handleProcessedMessage();
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: After handlerInstance->handleProcessedMessage() ...');
 		} elseif ($handlerInstance->isDecodedPackageXmlPending()) {
@@ -103,7 +103,7 @@ class NetworkPackageReaderTask extends BaseHubTask implements Taskable, Visitabl
 			 * A fully "decoded" package has arrived. This is raw XML and needs
 			 * to be parsed to a message.
 			 */
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Calling handlerInstance->handleDecodedPackageXml() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Invoking handlerInstance->handleDecodedPackageXml() ...');
 			$handlerInstance->handleDecodedPackageXml();
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: After handlerInstance->handleDecodedPackageXml() ...');
 		} elseif ($handlerInstance->isNewMessageArrived()) {
@@ -114,7 +114,7 @@ class NetworkPackageReaderTask extends BaseHubTask implements Taskable, Visitabl
 			 * as "XML variables" from the content (which must be a well-formed
 			 * XML) and then pushing it on the next stack "processed messages".
 			 */
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Calling handlerInstance->handleNewlyArrivedMessage() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Invoking handlerInstance->handleNewlyArrivedMessage() ...');
 			$handlerInstance->handleNewlyArrivedMessage();
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: After handlerInstance->handleNewlyArrivedMessage() ...');
 		} elseif ($handlerInstance->isIncomingRawDataHandled()) {
@@ -124,7 +124,7 @@ class NetworkPackageReaderTask extends BaseHubTask implements Taskable, Visitabl
 			 * PackageData for further details (what array elements are
 			 * required et cetera).
 			 */
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Calling handlerInstance->assembleDecodedDataToPackage() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Invoking handlerInstance->assembleDecodedDataToPackage() ...');
 			$handlerInstance->assembleDecodedDataToPackage();
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: After handlerInstance->assembleDecodedDataToPackage() ...');
 		} elseif ($handlerInstance->ifMultipleMessagesPending()) {
@@ -132,17 +132,17 @@ class NetworkPackageReaderTask extends BaseHubTask implements Taskable, Visitabl
 			 * Some raw data contained multiple messages which where now
 			 * splitted.
 			 */
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Calling handlerInstance->handleMultipleMessages() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Invoking handlerInstance->handleMultipleMessages() ...');
 			$handlerInstance->handleMultipleMessages();
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: After handlerInstance->handleMultipleMessages() ...');
 		} elseif ($handlerInstance->isNewRawDataPending()) {
 			// Raw, decoded data has been received
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Calling handlerInstance->handleIncomingDecodedData() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Invoking handlerInstance->handleIncomingDecodedData() ...');
 			$handlerInstance->handleIncomingDecodedData();
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: After handlerInstance->handleIncomingDecodedData() ...');
 		} elseif ($handlerInstance->ifAssemblerHasPendingDataLeft()) {
 			// Handle any pending data from the package assembler
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Calling handlerInstance->handleAssemblerPendingData() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: Invoking handlerInstance->handleAssemblerPendingData() ...');
 			$handlerInstance->handleAssemblerPendingData();
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-READER-TASK: After handlerInstance->handleAssemblerPendingData() ...');
 		}
diff --git a/application/hub/classes/tasks/network/class_NetworkPackageWriterTask.php b/application/hub/classes/tasks/network/class_NetworkPackageWriterTask.php
index fbfbffeaf..68047940c 100644
--- a/application/hub/classes/tasks/network/class_NetworkPackageWriterTask.php
+++ b/application/hub/classes/tasks/network/class_NetworkPackageWriterTask.php
@@ -91,19 +91,19 @@ class NetworkPackageWriterTask extends BaseHubTask implements Taskable, Visitabl
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-WRITER-TASK: handlerInstance=%s', $handlerInstance->__toString()));
 		if ($handlerInstance->isEncodedDataPending()) {
 			// Sent encoded (raw) data
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-WRITER-TASK: Calling handlerInstance->sendEncodedData() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-WRITER-TASK: Invoking handlerInstance->sendEncodedData() ...');
 			$handlerInstance->sendEncodedData();
 		} elseif ($handlerInstance->isPackageWaitingForDelivery()) {
 			// Sent it finally out
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-WRITER-TASK: Calling handlerInstance->sendWaitingPackage() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-WRITER-TASK: Invoking handlerInstance->sendWaitingPackage() ...');
 			$handlerInstance->sendWaitingPackage();
 		} elseif ($handlerInstance->isPackageDeclared()) {
 			// Prepare package for delivery
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-WRITER-TASK: Calling handlerInstance->processDeclaredPackage() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-WRITER-TASK: Invoking handlerInstance->processDeclaredPackage() ...');
 			$handlerInstance->processDeclaredPackage();
 		} elseif ($handlerInstance->isPackageEnqueued()) {
 			// Okay, then deliver (better discover its recipients) this package
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-WRITER-TASK: Calling handlerInstance->declareEnqueuedPackage() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE-WRITER-TASK: Invoking handlerInstance->declareEnqueuedPackage() ...');
 			$handlerInstance->declareEnqueuedPackage();
 		}
 
diff --git a/application/hub/classes/tasks/node/decoder/class_NodePackageDecoderTask.php b/application/hub/classes/tasks/node/decoder/class_NodePackageDecoderTask.php
index 0e29eabb3..9c0abfe08 100644
--- a/application/hub/classes/tasks/node/decoder/class_NodePackageDecoderTask.php
+++ b/application/hub/classes/tasks/node/decoder/class_NodePackageDecoderTask.php
@@ -83,11 +83,11 @@ class NodePackageDecoderTask extends BaseHubTask implements Taskable, Visitable
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NODE-PACKAGE-DECODER-TASK: decoderInstance=%s', $decoderInstance->__toString()));
 		if ($decoderInstance->ifDeocedPackagesLeft()) {
 			// Some decoded packages have arrived (for this node)
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE-PACKAGE-DECODER-TASK: Calling decoderInstance->handleDecodedPackage() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE-PACKAGE-DECODER-TASK: Invoking decoderInstance->handleDecodedPackage() ...');
 			$decoderInstance->handleDecodedPackage();
 		} elseif ($decoderInstance->ifUnhandledRawPackageDataLeft()) {
 			// Handle raw data as last option to prevent that the stack runs full
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE-PACKAGE-DECODER-TASK: Calling decoderInstance->handleRawPackageData() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NODE-PACKAGE-DECODER-TASK: Invoking decoderInstance->handleRawPackageData() ...');
 			$decoderInstance->handleRawPackageData();
 		}
 
diff --git a/application/hub/classes/tools/hub/class_HubTools.php b/application/hub/classes/tools/hub/class_HubTools.php
index a7a8b220d..fcdcda415 100644
--- a/application/hub/classes/tools/hub/class_HubTools.php
+++ b/application/hub/classes/tools/hub/class_HubTools.php
@@ -268,7 +268,7 @@ class HubTools extends BaseHubSystem {
 			self::$cachedAddresses['external'] = $unl;
 		} else {
 			// Determine own external address by connecting to home server at 188.138.90.169
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-TOOLS: Calling self::determineExternalUniversalNodeLocator() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-TOOLS: Invoking self::determineExternalUniversalNodeLocator() ...');
 			$unl = self::determineExternalUniversalNodeLocator();
 			self::$cachedAddresses['external'] = $unl;
 		}
@@ -292,7 +292,7 @@ class HubTools extends BaseHubSystem {
 			$unl = self::$cachedAddresses['internal'];
 		} elseif (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('allow_publish_internal_address') == 'N') {
 			// Not allowed to publish internal address, so use external
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-TOOLS: Calling self::determineOwnExternalAddress() as allow_publish_internal_address=N is set ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-TOOLS: Invoking self::determineOwnExternalAddress() as allow_publish_internal_address=N is set ...');
 			$unl = self::determineOwnExternalAddress();
 			self::$cachedAddresses['internal'] = $unl;
 		} elseif (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('internal_address') != '') {
@@ -302,7 +302,7 @@ class HubTools extends BaseHubSystem {
 			self::$cachedAddresses['internal'] = $unl;
 		} else {
 			// Determine own internal address
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-TOOLS: Calling self::determineInternalUniversalNodeLocator() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('HUB-TOOLS: Invoking self::determineInternalUniversalNodeLocator() ...');
 			$unl = self::determineInternalUniversalNodeLocator();
 			self::$cachedAddresses['internal'] = $unl;
 		}