Change namespace and prevent triple save