fixing identifiers