more renaming and refactoring
reverted back using connectioncontext to using commandcontext