update naming scheme