Refactoring

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