fixing some metrics

- perfadillianize queue names
- add '_' where missing