Fix some Namespacing issues
Release v3.2.0