modified naming conventions at Issue #71