Refactored the code to make the namespace consistent