change naming scheme