Namespace fix
Fix models primary keys