Update broken [rename] issues