Rename related names to be more appropriate.

Fix a duplicate pk in initial_data