modified naming scheme