Add primaryKey, char, fix id key to name.