rename elements and other changes ... big