changes some naming