FIX: Gateway name needs to match that used in the namespace/filepath