Fix related names in test model