[Maintenance] Redo identifiers to references