fix: Change the agent type name to not include the account name since this would generate LOTS of tables and cause problems long term (backport #6158)

fix: Change the agent type name to not include the account name since this would generate LOTS of tables and cause problems long term (backport #6158) #3501