modified naming convention