Some naming clean-up and structural refactoring