updates to catalog naming and routing
Merge branch 'dev'