You guessed it, more namespacing.

Signed-off-by: Don Gilbert <don@electriceasel.com>