name refactor (that used to work back at home, now the changes were missing. Well, oops?)