Fix some namespacing.  Parameter issues.