some naming changs