Refactoring

This is the refactoring that @cgruber mentioned in #303. The first two commits fix minor errors and the last two are completely refactoring including:

* significant changes in InjectAdapterProcessor which eliminate code duplication, increased readability, and also changed to follow the naming scheme proposed in #303.

* changes in ModuleAdapterProcessor mostly just to comply with the naming scheme.