fix paths & new names