Fixing namesspaces