FWAPI-17 Rename machine to vm

FWAPI-8 Improve fwadm logging