replacing agent-id with agent_id
renaming a few more variables to id