More bigrename fix