updates to catalog naming and routing