Better FK handler naming