diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/doclist.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/doclist.lib.js
index 54e672a9f0..0b5ba84aa1 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/doclist.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/doclist.lib.js
@@ -267,7 +267,7 @@ function doclist_main()
          item.location = location;
          
          // Check: thumbnail type is registered && node is a cm:content subtype
-         if (isThumbnailNameRegistered && item.node.isSubType("cm:content"))
+         if (isThumbnailNameRegistered && item.node.isSubType("{http://www.alfresco.org/model/content/1.0}content"))
          {
             // Make sure we have a thumbnail.
             thumbnail = item.node.getThumbnail(THUMBNAIL_NAME);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/evaluator.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/evaluator.lib.js
index d615fae8e0..fa404a1b83 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/evaluator.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/evaluator.lib.js
@@ -57,12 +57,12 @@ var Evaluator =
              */
             case "document":
                // Working Copy?
-               if (node.hasAspect("cm:workingcopy"))
+               if (node.hasAspect("{http://www.alfresco.org/model/content/1.0}workingcopy"))
                {
                   var wcNode = node.assocs["cm:original"][0];
                   workingCopy["isWorkingCopy"] = true;
                   workingCopy["sourceNodeRef"] = wcNode.nodeRef;
-                  if (wcNode.hasAspect("cm:versionable"))
+                  if (wcNode.hasAspect("{http://www.alfresco.org/model/content/1.0}versionable"))
                   {
                      workingCopy["workingCopyVersion"] = wcNode.properties["cm:versionLabel"];
                   }
@@ -75,7 +75,7 @@ var Evaluator =
                   }
                }
                // Locked?
-               else if (node.isLocked && !node.hasAspect("trx:transferred") && node.hasAspect("cm:checkedOut"))
+               else if (node.isLocked && !node.hasAspect("trx:transferred") && node.hasAspect("{http://www.alfresco.org/model/content/1.0}checkedOut"))
                {
                   var srcNode = node.assocs["cm:workingcopylink"][0];
                   workingCopy["hasWorkingCopy"] = true;
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/item.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/item.lib.ftl
index d4ccfefbb0..c57e681388 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/item.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/item.lib.ftl
@@ -1,7 +1,7 @@
 <#macro itemJSON item>
    <#local node = item.node>
    <#local version = "1.0">
-   <#if node.hasAspect("cm:versionable")><#local version = node.properties["cm:versionLabel"]!""></#if>
+   <#if node.hasAspect("{http://www.alfresco.org/model/content/1.0}versionable")><#local version = node.properties["cm:versionLabel"]!""></#if>
    <#escape x as jsonUtils.encodeJSONString(x)>
    "version": "${version}",
    "webdavUrl": "${node.webdavUrl}",
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js
index 108342a019..04b2305306 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/parse-args.lib.js
@@ -168,8 +168,8 @@ var Common =
 
       try
       {
-         isLiked = ratingService.getRating(node, LIKES_SCHEME) !== -1;
          totalLikes = ratingService.getRatingsCount(node, LIKES_SCHEME);
+         isLiked = totalLikes === 0 ? false : ratingService.getRating(node, LIKES_SCHEME) !== -1;
       }
       catch (e) {}
       
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/evaluator.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/evaluator.lib.js
index 360c6dc951..e8560183b0 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/evaluator.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/evaluator.lib.js
@@ -151,7 +151,7 @@ var Evaluator =
             Evaluator.documentAndFolder(node, permissions, status, actionLabels);
             
             // Working Copy?
-            if (node.hasAspect("cm:workingcopy"))
+            if (node.hasAspect("{http://www.alfresco.org/model/content/1.0}workingcopy"))
             {
                var wcStatus = "";
                lockedBy = Common.getPerson(node.properties["cm:workingCopyOwner"]);
@@ -169,7 +169,7 @@ var Evaluator =
                var wcNode = node.assocs["cm:original"][0];
                custom["isWorkingCopy"] = true;
                custom["workingCopyOriginal"] = wcNode.nodeRef;
-               if (wcNode.hasAspect("cm:versionable"))
+               if (wcNode.hasAspect("{http://www.alfresco.org/model/content/1.0}versionable"))
                {
                   custom["workingCopyVersion"] = wcNode.properties["cm:versionLabel"];
                }
@@ -198,7 +198,7 @@ var Evaluator =
             else if (node.isLocked && !node.hasAspect("trx:transferred"))
             {
                var lockStatus = "";
-               lockedBy = Common.getPerson(node.properties["cm:lockOwner"]);
+               lockedBy = Common.getPerson(node.properties["{http://www.alfresco.org/model/content/1.0}lockOwner"]);
                lockOwnerUser = lockedBy.userName;
                if (lockOwnerUser == person.properties.userName)
                {
@@ -210,7 +210,7 @@ var Evaluator =
                   lockStatus = "locked " + lockedBy.displayName + "|" + lockedBy.userName;
                   actionSet = "locked";
                }
-               if (node.hasAspect("cm:checkedOut"))
+               if (node.hasAspect("{http://www.alfresco.org/model/content/1.0}checkedOut"))
                {
                   var srcNode = node.assocs["cm:workingcopylink"][0];
                   custom["hasWorkingCopy"] = true;
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl
index 150d9e098a..f1b7920b09 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/item.lib.ftl
@@ -15,7 +15,7 @@
    <#escape x as jsonUtils.encodeJSONString(x)>
       <#local node = item.node>
       <#local version = "1.0">
-      <#if node.hasAspect("cm:versionable")><#local version = node.properties["cm:versionLabel"]!""></#if>
+      <#if node.hasAspect("{http://www.alfresco.org/model/content/1.0}versionable")><#local version = node.properties["cm:versionLabel"]!""></#if>
       <#if item.createdBy??>
          <#local createdBy = item.createdBy.displayName>
          <#local createdByUser = item.createdBy.userName>
@@ -45,7 +45,7 @@
    "linkedNodeRef": "${item.linkedNode.nodeRef?string}",
 </#if>
    "fileName": "<#if item.linkedNode??>${item.linkedNode.name}<#else>${node.name}</#if>",
-   "displayName": "<#if item.linkedNode??>${item.linkedNode.name}<#elseif node.hasAspect("cm:workingcopy")>${node.name?replace(workingCopyLabel, "")}<#else>${node.name}</#if>",
+   "displayName": "<#if item.linkedNode??>${item.linkedNode.name}<#elseif node.hasAspect("{http://www.alfresco.org/model/content/1.0}workingcopy")>${node.name?replace(workingCopyLabel, "")}<#else>${node.name}</#if>",
    "status": "<#list item.status?keys as s><#if item.status[s]?is_boolean && item.status[s] == true>${s}<#if s_has_next>,</#if></#if></#list>",
    "title": "${node.properties.title!""}",
    "description": "${node.properties.description!""}",
@@ -56,7 +56,7 @@
    "modifiedOn": "<@dateFormat node.properties.modified />",
    "modifiedBy": "${modifiedBy}",
    "modifiedByUser": "${modifiedByUser}",
-   <#if node.hasAspect("cm:thumbnailModification")>
+   <#if node.hasAspect("{http://www.alfresco.org/model/content/1.0}thumbnailModification")>
       <#list node.properties.lastThumbnailModification as thumbnailMod>
          <#if thumbnailMod?contains("doclib")>
    "lastThumbnailModification": "${thumbnailMod}",
@@ -71,7 +71,7 @@
    "webdavUrl": "${node.webdavUrl}",
    "actionSet": "${item.actionSet}",
    "tags": <#noescape>[${tags}]</#noescape>,
-   <#if node.hasAspect("cm:generalclassifiable")>
+   <#if node.hasAspect("{http://www.alfresco.org/model/content/1.0}generalclassifiable")>
    "categories": [<#list node.properties.categories![] as c>["${c.name}", "${c.displayPath?replace("/categories/General","")}"]<#if c_has_next>,</#if></#list>],
    </#if>
    <#if item.activeWorkflows??>"activeWorkflows": "<#list item.activeWorkflows as aw>${aw}<#if aw_has_next>,</#if></#list>",</#if>
@@ -98,12 +98,12 @@
       </#if>
       }
    },
-   <#if node.hasAspect("cm:geographic")>"geolocation":
+   <#if node.hasAspect("{http://www.alfresco.org/model/content/1.0}geographic")>"geolocation":
    {
       "latitude": <@renderNumber node.properties["cm:latitude"] />,
       "longitude": <@renderNumber node.properties["cm:longitude"] />
    },</#if>
-   <#if node.hasAspect("audio:audio")>"audio":
+   <#if node.hasAspect("{http://www.alfresco.org/model/audio/1.0}audio")>"audio":
    {
       "album": "${node.properties["audio:album"]!""}",
       "artist": "${node.properties["audio:artist"]!""}",
@@ -117,7 +117,7 @@
       "channelType": "${node.properties["audio:channelType"]!""}",
       "compressor": "${node.properties["audio:compressor"]!""}"
    },</#if>
-   <#if node.hasAspect("exif:exif")>"exif":
+   <#if node.hasAspect("{http://www.alfresco.org/model/exif/1.0}exif")>"exif":
    {
       "dateTimeOriginal": "<@dateFormat node.properties["exif:dateTimeOriginal"] />",
       "pixelXDimension": <@renderNumber node.properties["exif:pixelXDimension"] />,
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js
index 7ffc02fa32..88fc599c95 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/parse-args.lib.js
@@ -294,8 +294,8 @@ var Common =
 
       try
       {
-         isLiked = ratingService.getRating(node, LIKES_SCHEME) !== -1;
          totalLikes = ratingService.getRatingsCount(node, LIKES_SCHEME);
+         isLiked = totalLikes === 0 ? false : ratingService.getRating(node, LIKES_SCHEME) !== -1;
       }
       catch (e) {}
       
diff --git a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
index 53bc7b1c80..8be5e26dc6 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
@@ -56,9 +56,6 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.util.EqualsHelper;
-import org.alfresco.util.Pair;
-import org.apache.commons.lang.NotImplementedException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.surf.util.URLDecoder;
@@ -538,14 +535,14 @@ public class WebDAVHelper
         FileFolderService fileFolderService = getFileFolderService();
         
         // get the path elements
-        List<FileInfo> pathInfos = fileFolderService.getNamePath(rootNodeRef, nodeRef);
+        List<String> pathInfos = fileFolderService.getNameOnlyPath(rootNodeRef, nodeRef);
         
         // build the path string
         StringBuilder sb = new StringBuilder(pathInfos.size() * 20);
-        for (FileInfo fileInfo : pathInfos)
+        for (String fileInfo : pathInfos)
         {
             sb.append(WebDAVHelper.PathSeperatorChar);
-            sb.append(fileInfo.getName());
+            sb.append(fileInfo);
         }
         // done
         if (logger.isDebugEnabled())