Name change tests fixes