Add flexible mount point naming strategy