modified naming-scheme