more adjustment and rename function that its name mismatch with related_name attribute