diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.Summary.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.Summary.cshtml
index c7558a982..5b4f5fd80 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.Summary.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.Summary.cshtml
@@ -5,11 +5,12 @@
 @{
     var field = (MediaLibraryPickerField) Model.ContentField;
     string name = field.DisplayName;
+    string techName = field.Name;
     var mediaParts = field.MediaParts;
 }
 @if (mediaParts.Any()) {
 <span class="name">@name:</span>
-<p class="media-@name.HtmlClassify()">    
+<p class="media-@techName.HtmlClassify()">    
         @foreach (var contentItem in mediaParts) {
                 @Display(BuildDisplay(contentItem, "Thumbnail"))
         }
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml
index f899f48d9..d5d267795 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml
@@ -5,12 +5,13 @@
 @{
     var field = (MediaLibraryPickerField) Model.ContentField;
     string name = field.DisplayName;
+    string techName = field.Name;
     var mediaParts = field.MediaParts;
 
     var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
 }
 <span class="name">@name:</span>
-<p class="media-library-picker-field media-library-picker-field-@name.HtmlClassify()">
+<p class="media-library-picker-field media-library-picker-field-@techName.HtmlClassify()">
     
     @if (mediaParts.Any()) {
         foreach (var contentItem in mediaParts) {
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml
index e304ca454..bf6374a58 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml
@@ -5,9 +5,10 @@
 @{
     var field = (MediaLibraryPickerField) Model.ContentField;
     string name = field.DisplayName;
+    string techName = field.Name;
     var contents = field.MediaParts;
 }
-<section class="media-library-picker-field media-library-picker-field-@name.HtmlClassify()">
+<section class="media-library-picker-field media-library-picker-field-@techName.HtmlClassify()">
     <h3>@name</h3>
     @foreach(var content in contents) {
     <div>