Cleaned up namespace usage so external references don't have to be fully qualified.