fix up identifiers for clarity