- Trying to fix cross-module namespace references