Fixed namespace issues that were causing conflicts with other modules