changing basic naming