fix missing *Context.cs references in .NET 2.0 projects
refactor method parameter names to align with XML code comments (else WARNINGS as ERRORS will detect these and fail the build)