Refactored IdentityKit

Just renamed some things.