Finally normalized the keys (until they're configurable)