Rename vm_job to calculator

 * Also fixed old CLI execution creation

Change-Id: Idf2766f61c4a0dced68dd993fb6dbd957011a2a9