modify logging, events and tests to handle removed app name from node id