Fixed issue with the namespace generation