mod: change naming from independent to universal