Replace 'agent' with 'Agent' in a few more places