diff --git a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraAttributesFinderFeature.java b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraAttributesFinderFeature.java
index 517d288e213..5b1649e3c51 100644
--- a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraAttributesFinderFeature.java
+++ b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraAttributesFinderFeature.java
@@ -31,7 +31,6 @@ public CteraAttributesFinderFeature(final DAVSession session) {
     protected List<DavResource> list(final Path file) throws IOException {
         final List<QName> l = new ArrayList<>();
         l.addAll(allCteraCustomACLQn);
-        // CTERA-137
         l.add(SardineUtil.createQNameWithCustomNamespace("guid"));
         return session.getClient().list(new DAVPathEncoder().encode(file), 0,
                 new HashSet<>(l)
@@ -45,9 +44,8 @@ public PathAttributes toAttributes(final DavResource resource) {
         final Acl acl = customPropsToAcl(customProps);
         final Permission p = aclToPermission(acl);
         final PathAttributes attributes = super.toAttributes(resource);
-        // CTERA-137
         if(customProps != null && customProps.containsKey("guid")) {
-            attributes.withVersionId(customProps.get("guid"));
+            attributes.withFileId(customProps.get("guid"));
         }
         return attributes
                 .withAcl(acl)
diff --git a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraListService.java b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraListService.java
index 24b60f8c07c..48dafb9f546 100644
--- a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraListService.java
+++ b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraListService.java
@@ -49,7 +49,6 @@ protected List<DavResource> list(final Path directory) throws IOException {
                 Stream.of(
                         // TODO CTERA-136 sent as CteraSession.getFeature(ListService.class) returns DAVListService, but Timestamp feature disabled in CteraSession.getFeature(Timestamp.class) - do we need it?
 //                    DAVTimestampFeature.LAST_MODIFIED_CUSTOM_NAMESPACE, DAVTimestampFeature.LAST_MODIFIED_SERVER_CUSTOM_NAMESPACE
-                        // CTERA-137
                         SardineUtil.createQNameWithCustomNamespace("guid")
                 ),
                 allCteraCustomACLQn.stream()
diff --git a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraSession.java b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraSession.java
index ecc39e59dff..8ff090104fc 100644
--- a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraSession.java
+++ b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraSession.java
@@ -204,7 +204,7 @@ public <T> T _getFeature(final Class<T> type) {
         if(type == Timestamp.class) {
             return null;
         }
-        // TODO CTERA-137 enable propfind for testing
+        // TODO CTERA-137 undo workaround to enable propfind for embeddedWebDAV testing
         if(type == Metadata.class && !(embeddedWebDAV || host.getProperty("embeddedWebDAV").equalsIgnoreCase("true"))) {
             return null;
         }