Dino catalog - Revison 2

Use better names for `|e, a|`, it's not clear