Rename some classes and features.
Add test coverage for named scopes.
Add tests for named scopes.
Add variables to named scopes.
Add pending test cases for remaining DSL.