fix changes to naming scheme