Refactor names in catalog backends

Change-Id: Ic447056d8572d8d444e5199e7bd63e2f7f7ce97b
Merge "Refactor names in catalog backends"