Update the configuration to reflect the model selection.
Fix method/constructor naming collisions.
Fix a strict notice regarding references.
Merge pull request #62 from adam-vessey/7.x-fix-collisions

7.x fix collisions