more naming scheme changes