tests + AMQP naming convention changes
wip
cleanup and tests of the AMQP terminal
fix of renamed files
fix of renamed files
cleanup in AMQP terminal