modified naming conventions