Adjustments to rename_u4e