update naming in everything