Renamed most XxxDeclaration to XxxDefinition...