Fixing identifiers