Fixed packaging issues regarding namespace