Index: extensions/modeshape-connector-filesystem/src/main/java/org/modeshape/connector/filesystem/FileSystemSource.java
===================================================================
--- extensions/modeshape-connector-filesystem/src/main/java/org/modeshape/connector/filesystem/FileSystemSource.java	(revision 2515)
+++ extensions/modeshape-connector-filesystem/src/main/java/org/modeshape/connector/filesystem/FileSystemSource.java	(working copy)
@@ -127,6 +127,15 @@ public class FileSystemSource extends AbstractRepositorySource implements Object
     public static final int DEFAULT_MAX_PATH_LENGTH = 255; // 255 for windows users
     public static final String DEFAULT_EXCLUSION_PATTERN = null;
     public static final FilenameFilter DEFAULT_FILENAME_FILTER = null;
+    private static final FilenameFilter ACCEPT_ALL_FILTER = new FilenameFilter() {
+
+        @Override
+        public boolean accept( File file,
+                               String filename ) {
+            return true;
+        }
+
+    };
 
     protected static Map<String, CustomPropertiesFactory> EXTRA_PROPERTIES_CLASSNAME_BY_KEY;
 
@@ -337,6 +346,10 @@ public class FileSystemSource extends AbstractRepositorySource implements Object
                 filenameFilter = ((BasePropertiesFactory)customPropsFactory).getFilenameFilter(filenameFilter);
             }
         }
+
+        // If there are no criteria that would allow us to build a filter, then accept any file.
+        if (filenameFilter == null) filenameFilter = ACCEPT_ALL_FILTER;
+
         return filenameFilter;
     }
 
Index: modeshape-graph/src/main/java/org/modeshape/graph/connector/base/PathTransaction.java
===================================================================
--- modeshape-graph/src/main/java/org/modeshape/graph/connector/base/PathTransaction.java	(revision 2515)
+++ modeshape-graph/src/main/java/org/modeshape/graph/connector/base/PathTransaction.java	(working copy)
@@ -449,7 +449,7 @@ public abstract class PathTransaction<NodeType extends PathNode, WorkspaceType e
 
         // Change the name of the new node ...
         NodeType newChild = (NodeType)copyOfOriginalChild.withName(childName).withParent(pathTo(parent));
-        parent = (NodeType)parent.withChild(index, originalChild.getName());
+        parent = (NodeType)parent.withChild(index, newChild.getName());
         changes.moved(originalChild, newChild, parent);
 
         return locationFor(newChild);
Index: modeshape-integration-tests/src/test/java/org/modeshape/test/integration/FileSystemFilterTest.java
deleted file mode 100644
===================================================================
--- modeshape-integration-tests/src/test/java/org/modeshape/test/integration/FileSystemFilterTest.java	(revision 2515)
+++ /dev/null	(working copy)
@@ -1,109 +0,0 @@
-package org.modeshape.test.integration;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.util.concurrent.TimeUnit;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.ValueFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.modeshape.common.FixFor;
-import org.modeshape.common.collection.Problem;
-import org.modeshape.common.util.FileUtil;
-import org.modeshape.connector.filesystem.FileSystemSource;
-import org.modeshape.jcr.JcrConfiguration;
-import org.modeshape.jcr.JcrEngine;
-import org.modeshape.jcr.JcrRepository;
-
-public class FileSystemFilterTest {
-
-    private static final String SOURCE_NAME = "Source";
-    private static final String REPO_NAME = "Repository";
-    private static final String STORAGE_PATH = "./target/scratch";
-    private static final String EXCLUSION_PATTERN = ".*mode";
-
-    private JcrEngine engine;
-    private Session session;
-    private ValueFactory vf;
-    private File scratchSpace;
-
-    @Before
-    public void beforeEach() throws Exception {
-        scratchSpace = new File(STORAGE_PATH);
-
-        if (!scratchSpace.exists()) {
-            scratchSpace.mkdir();
-        }
-
-        JcrConfiguration config = new JcrConfiguration();
-
-        config.repositorySource(SOURCE_NAME).usingClass(FileSystemSource.class).setProperty("exclusionPattern", EXCLUSION_PATTERN).setProperty("workspaceRootPath",
-                                                                                                                                        STORAGE_PATH).setProperty("defaultWorkspaceName",
-                                                                                                                                                             "default").setProperty("updatesAllowed",
-                                                                                                                                                                                    true);
-        config.repository(REPO_NAME).setSource(SOURCE_NAME).setOption(JcrRepository.Option.ANONYMOUS_USER_ROLES, "readwrite");
-        
-        engine = config.build();
-        engine.start();
-
-        if (engine.getProblems().hasProblems()) {
-            for (Problem problem : engine.getProblems()) {
-                System.err.println(problem.getMessageString());
-            }
-        }
-
-        JcrRepository repo = engine.getRepository(REPO_NAME);
-        session = repo.login("default");
-        vf = session.getValueFactory();
-    }
-
-    @After
-    public void afterEach() throws Exception {
-        if (session != null) session.logout();
-        engine.shutdownAndAwaitTermination(3, TimeUnit.SECONDS);
-        
-        FileUtil.delete(scratchSpace);
-    }
-
-    @FixFor( "MODE-986" )
-    @Test( expected = RepositoryException.class )
-    public void shouldNotBeAbleToCreateFileWithFilteredName() throws Exception {
-        Node root = session.getRootNode();
-        Node file = root.addNode("createfile.mode", "nt:file");
-        Node content = file.addNode("jcr:content", "nt:resource");
-        content.setProperty("jcr:data", vf.createBinary(new ByteArrayInputStream("Write 1".getBytes())));
-
-        session.save();
-
-    }
-
-    @FixFor( "MODE-986" )
-    @Test( expected = RepositoryException.class )
-    public void shouldNotBeAbleToRenameToFileWithFilteredName() throws Exception {
-        Node root = session.getRootNode();
-        Node file = root.addNode("moveSource.txt", "nt:file");
-        Node content = file.addNode("jcr:content", "nt:resource");
-        content.setProperty("jcr:data", vf.createBinary(new ByteArrayInputStream("Write 1".getBytes())));
-        session.save();
-        
-        session.move("/moveSource.txt", "/createfile.mode");
-        session.save();
-    }
-
-    @FixFor( "MODE-986" )
-    @Test( expected = RepositoryException.class )
-    public void shouldNotBeAbleToCopyToFileWithFilteredName() throws Exception {
-        Node root = session.getRootNode();
-        Node file = root.addNode("copySource.txt", "nt:file");
-        Node content = file.addNode("jcr:content", "nt:resource");
-        content.setProperty("jcr:data", vf.createBinary(new ByteArrayInputStream("Write 1".getBytes())));
-        session.save();
-
-        session.getWorkspace().copy("/copySource.txt", "/createfile.mode");
-        session.save();
-
-    }
-}
Index: modeshape-integration-tests/src/test/java/org/modeshape/test/integration/JcrOnFileSystemTest.java
new file mode 100644
===================================================================
--- /dev/null	(revision 2515)
+++ modeshape-integration-tests/src/test/java/org/modeshape/test/integration/JcrOnFileSystemTest.java	(working copy)
@@ -0,0 +1,128 @@
+package org.modeshape.test.integration;
+
+import static org.junit.Assert.assertTrue;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.ValueFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.modeshape.common.FixFor;
+import org.modeshape.common.collection.Problem;
+import org.modeshape.common.util.FileUtil;
+import org.modeshape.connector.filesystem.FileSystemSource;
+import org.modeshape.jcr.JcrConfiguration;
+import org.modeshape.jcr.JcrEngine;
+import org.modeshape.jcr.JcrRepository;
+
+public class JcrOnFileSystemTest {
+
+    private static final String SOURCE_NAME = "Source";
+    private static final String REPO_NAME = "Repository";
+    private static final String STORAGE_PATH = "./target/scratch";
+    private static final String EXCLUSION_PATTERN = ".*mode";
+
+    private JcrEngine engine;
+    private Session session;
+    private ValueFactory vf;
+    private File scratchSpace;
+
+    @Before
+    public void beforeEach() throws Exception {
+        scratchSpace = new File(STORAGE_PATH);
+
+        if (!scratchSpace.exists()) {
+            scratchSpace.mkdir();
+        }
+
+        JcrConfiguration config = new JcrConfiguration();
+
+        config.repositorySource(SOURCE_NAME).usingClass(FileSystemSource.class).setProperty("exclusionPattern", EXCLUSION_PATTERN).setProperty("workspaceRootPath",
+                                                                                                                                        STORAGE_PATH).setProperty("defaultWorkspaceName",
+                                                                                                                                                             "default").setProperty("updatesAllowed",
+                                                                                                                                                                                    true);
+        config.repository(REPO_NAME).setSource(SOURCE_NAME).setOption(JcrRepository.Option.ANONYMOUS_USER_ROLES, "readwrite");
+        
+        engine = config.build();
+        engine.start();
+
+        if (engine.getProblems().hasProblems()) {
+            for (Problem problem : engine.getProblems()) {
+                System.err.println(problem.getMessageString());
+            }
+        }
+
+        JcrRepository repo = engine.getRepository(REPO_NAME);
+        session = repo.login("default");
+        vf = session.getValueFactory();
+    }
+
+    @After
+    public void afterEach() throws Exception {
+        if (session != null) session.logout();
+        engine.shutdownAndAwaitTermination(3, TimeUnit.SECONDS);
+        
+        FileUtil.delete(scratchSpace);
+    }
+
+    @FixFor( "MODE-986" )
+    @Test( expected = RepositoryException.class )
+    public void shouldNotBeAbleToCreateFileWithFilteredName() throws Exception {
+        Node root = session.getRootNode();
+        Node file = root.addNode("createfile.mode", "nt:file");
+        Node content = file.addNode("jcr:content", "nt:resource");
+        content.setProperty("jcr:data", vf.createBinary(new ByteArrayInputStream("Write 1".getBytes())));
+
+        session.save();
+
+    }
+
+    @FixFor( "MODE-986" )
+    @Test( expected = RepositoryException.class )
+    public void shouldNotBeAbleToRenameToFileWithFilteredName() throws Exception {
+        Node root = session.getRootNode();
+        Node file = root.addNode("moveSource.txt", "nt:file");
+        Node content = file.addNode("jcr:content", "nt:resource");
+        content.setProperty("jcr:data", vf.createBinary(new ByteArrayInputStream("Write 1".getBytes())));
+        session.save();
+        
+        session.move("/moveSource.txt", "/createfile.mode");
+        session.save();
+    }
+
+    @FixFor( "MODE-986" )
+    @Test( expected = RepositoryException.class )
+    public void shouldNotBeAbleToCopyToFileWithFilteredName() throws Exception {
+        Node root = session.getRootNode();
+        Node file = root.addNode("copySource.txt", "nt:file");
+        Node content = file.addNode("jcr:content", "nt:resource");
+        content.setProperty("jcr:data", vf.createBinary(new ByteArrayInputStream("Write 1".getBytes())));
+        session.save();
+
+        session.getWorkspace().copy("/copySource.txt", "/createfile.mode");
+        session.save();
+
+    }
+
+    @FixFor( "MODE-1010" )
+    @Test
+    public void shouldAllowFileRenameThroughJcr() throws Exception {
+        Node root = session.getRootNode();
+        root.addNode("oldname", "nt:folder");
+        session.save();
+
+        File oldFile = new File(STORAGE_PATH + File.separator + "default" + File.separator + "oldname");
+        assertTrue(oldFile.exists());
+
+        session.move("/oldname", "/newname1");
+        session.save();
+
+        File newFile = new File(STORAGE_PATH + File.separator + "default" + File.separator + "newname1");
+        assertTrue(newFile.exists());
+
+    }
+}