Namespace Fixes

Fix issues with different app namespaces confusing PHP