fixed name change of some objects due to merge