diff --git a/addons/kubeflow-nfsserverprovisioner/2.3.x/nfsserverprovisioner-1.yaml b/addons/kubeflow-nfs/2.3.x/nfsserverprovisioner-1.yaml
similarity index 92%
rename from addons/kubeflow-nfsserverprovisioner/2.3.x/nfsserverprovisioner-1.yaml
rename to addons/kubeflow-nfs/2.3.x/nfsserverprovisioner-1.yaml
index 046275b..4e36dfb 100644
--- a/addons/kubeflow-nfsserverprovisioner/2.3.x/nfsserverprovisioner-1.yaml
+++ b/addons/kubeflow-nfs/2.3.x/nfsserverprovisioner-1.yaml
@@ -6,12 +6,12 @@ metadata:
     catalog.kubeaddons.mesosphere.io/addon-revision: 2.3.0-1
     values.chart.helm.kubeaddons.mesosphere.io/nfsserverprovisioner: "https://raw.githubusercontent.com/mesosphere/charts/master/staging/nfs-server-provisioner/values.yaml"
   labels:
-    kubeaddons.mesosphere.io/name: kubeflow-nfsserverprovisioner
+    kubeaddons.mesosphere.io/name: kubeflow-nfs
     kubeaddons.mesosphere.io/provides: storageclass
     # TODO: we're temporarily supporting dependency on an existing default storage class
     # on the cluster, this hack will trigger re-queue on Addons until one exists.
     kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true"
-  name: kubeflow-nfsserverprovisioner
+  name: kubeflow-nfs
   namespace: kubeaddons
 spec:
   kubernetes:
diff --git a/metadata/static/kubeflow-nfsserverprovisioner/overview.md b/metadata/static/kubeflow-nfs/overview.md
similarity index 100%
rename from metadata/static/kubeflow-nfsserverprovisioner/overview.md
rename to metadata/static/kubeflow-nfs/overview.md