change namespacing to camelcase