Fixing problems caused by rename