Fixed a few problems with rename system