Fixes: DEPRECATION WARNING: Calling set_primary_key is deprecated. Please use self.primary_key = the_name instead.
Spec cleanup