updates to the naming scheme