Rename elements and fixe path issue