Fixing Jeff's rename nonsense