Fix some namespacing.