Fix namespaces

use namespaces in a more pythonic way