Fix identifiers, fixes #481