Three more classes needing namespacing.