Merging Richard's rename test.