Merge and model related names fix