PageContents -> Page
PageCondition -> Condition

and inner class Condition::FooCondition -> Condition::Foo
Rename files
Rename files
Merge branch 'improve-class-names'