Refactor ApplicationLayerCatalog IDs