Execute: Properly update identifiers