Fixes to angular module namespaces