more progress on name change and merge