Merge pull request #527 from libgit2/ntk/filestatus

FileStatus names

20 files changed, 214 insertions, 166 deletions

diff --git a/LibGit2Sharp.Tests/CheckoutFixture.cs b/LibGit2Sharp.Tests/CheckoutFixture.cs
index d0c1e8e5..9e95b922 100644
--- a/LibGit2Sharp.Tests/CheckoutFixture.cs
+++ b/LibGit2Sharp.Tests/CheckoutFixture.cs
@@ -527,13 +527,13 @@ namespace LibGit2Sharp.Tests
 
                 // Verify that there is an untracked entry.
                 Assert.Equal(1, repo.RetrieveStatus().Untracked.Count());
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(fullPathFileB));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(fullPathFileB));
 
                 repo.Checkout(otherBranchName);
 
                 // Verify untracked entry still exists.
                 Assert.Equal(1, repo.RetrieveStatus().Untracked.Count());
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(fullPathFileB));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(fullPathFileB));
             }
         }
 
@@ -551,13 +551,13 @@ namespace LibGit2Sharp.Tests
 
                 // Verify that there is an untracked entry.
                 Assert.Equal(1, repo.RetrieveStatus().Untracked.Count());
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(fullPathFileB));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(fullPathFileB));
 
                 repo.Checkout(otherBranchName, new CheckoutOptions() { CheckoutModifiers = CheckoutModifiers.Force });
 
                 // Verify untracked entry still exists.
                 Assert.Equal(1, repo.RetrieveStatus().Untracked.Count());
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(fullPathFileB));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(fullPathFileB));
             }
         }
 
@@ -575,13 +575,13 @@ namespace LibGit2Sharp.Tests
 
                 // Verify that there is a modified entry.
                 Assert.Equal(1, repo.RetrieveStatus().Modified.Count());
-                Assert.Equal(FileStatus.Modified, repo.RetrieveStatus(fullPathFileA));
+                Assert.Equal(FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(fullPathFileA));
 
                 repo.Checkout(otherBranchName);
 
                 // Verify modified entry still exists.
                 Assert.Equal(1, repo.RetrieveStatus().Modified.Count());
-                Assert.Equal(FileStatus.Modified, repo.RetrieveStatus(fullPathFileA));
+                Assert.Equal(FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(fullPathFileA));
             }
         }
 
@@ -600,13 +600,13 @@ namespace LibGit2Sharp.Tests
 
                 // Verify that there is a staged entry.
                 Assert.Equal(1, repo.RetrieveStatus().Staged.Count());
-                Assert.Equal(FileStatus.Staged, repo.RetrieveStatus(fullPathFileA));
+                Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus(fullPathFileA));
 
                 repo.Checkout(otherBranchName);
 
                 // Verify staged entry still exists.
                 Assert.Equal(1, repo.RetrieveStatus().Staged.Count());
-                Assert.Equal(FileStatus.Staged, repo.RetrieveStatus(fullPathFileA));
+                Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus(fullPathFileA));
             }
         }
 
@@ -935,10 +935,10 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("master", "6dcf9bf", "readme.txt", FileStatus.Added)]
-        [InlineData("master", "refs/tags/lw", "readme.txt", FileStatus.Added)]
-        [InlineData("master", "i-do-numbers", "super-file.txt", FileStatus.Added)]
-        [InlineData("i-do-numbers", "diff-test-cases", "numbers.txt", FileStatus.Staged)]
+        [InlineData("master", "6dcf9bf", "readme.txt", FileStatus.NewInIndex)]
+        [InlineData("master", "refs/tags/lw", "readme.txt", FileStatus.NewInIndex)]
+        [InlineData("master", "i-do-numbers", "super-file.txt", FileStatus.NewInIndex)]
+        [InlineData("i-do-numbers", "diff-test-cases", "numbers.txt", FileStatus.ModifiedInIndex)]
         public void CanCheckoutPath(string originalBranch, string checkoutFrom, string path, FileStatus expectedStatus)
         {
             string repoPath = SandboxStandardTestRepo();
@@ -973,7 +973,7 @@ namespace LibGit2Sharp.Tests
 
                 foreach (string checkoutPath in checkoutPaths)
                 {
-                    Assert.Equal(FileStatus.Added, repo.RetrieveStatus(checkoutPath));
+                    Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(checkoutPath));
                 }
             }
         }
diff --git a/LibGit2Sharp.Tests/ConflictFixture.cs b/LibGit2Sharp.Tests/ConflictFixture.cs
index af166367..65a98659 100644
--- a/LibGit2Sharp.Tests/ConflictFixture.cs
+++ b/LibGit2Sharp.Tests/ConflictFixture.cs
@@ -47,22 +47,22 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData(true, "ancestor-and-ours.txt", true, false, FileStatus.Removed, 2)]
-        [InlineData(false, "ancestor-and-ours.txt", true, true, FileStatus.Removed |FileStatus.Untracked, 2)]
+        [InlineData(true, "ancestor-and-ours.txt", true, false, FileStatus.DeletedFromIndex, 2)]
+        [InlineData(false, "ancestor-and-ours.txt", true, true, FileStatus.DeletedFromIndex |FileStatus.NewInWorkdir, 2)]
         [InlineData(true, "ancestor-and-theirs.txt", true, false, FileStatus.Nonexistent, 2)]
-        [InlineData(false, "ancestor-and-theirs.txt", true, true, FileStatus.Untracked, 2)]
+        [InlineData(false, "ancestor-and-theirs.txt", true, true, FileStatus.NewInWorkdir, 2)]
         [InlineData(true, "ancestor-only.txt", false, false, FileStatus.Nonexistent, 1)]
         [InlineData(false, "ancestor-only.txt", false, false, FileStatus.Nonexistent, 1)]
-        [InlineData(true, "conflicts-one.txt", true, false, FileStatus.Removed, 3)]
-        [InlineData(false, "conflicts-one.txt", true, true, FileStatus.Removed | FileStatus.Untracked, 3)]
-        [InlineData(true, "conflicts-two.txt", true, false, FileStatus.Removed, 3)]
-        [InlineData(false, "conflicts-two.txt", true, true, FileStatus.Removed | FileStatus.Untracked, 3)]
-        [InlineData(true, "ours-and-theirs.txt", true, false, FileStatus.Removed, 2)]
-        [InlineData(false, "ours-and-theirs.txt", true, true, FileStatus.Removed | FileStatus.Untracked, 2)]
-        [InlineData(true, "ours-only.txt", true, false, FileStatus.Removed, 1)]
-        [InlineData(false, "ours-only.txt", true, true, FileStatus.Removed | FileStatus.Untracked, 1)]
+        [InlineData(true, "conflicts-one.txt", true, false, FileStatus.DeletedFromIndex, 3)]
+        [InlineData(false, "conflicts-one.txt", true, true, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, 3)]
+        [InlineData(true, "conflicts-two.txt", true, false, FileStatus.DeletedFromIndex, 3)]
+        [InlineData(false, "conflicts-two.txt", true, true, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, 3)]
+        [InlineData(true, "ours-and-theirs.txt", true, false, FileStatus.DeletedFromIndex, 2)]
+        [InlineData(false, "ours-and-theirs.txt", true, true, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, 2)]
+        [InlineData(true, "ours-only.txt", true, false, FileStatus.DeletedFromIndex, 1)]
+        [InlineData(false, "ours-only.txt", true, true, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, 1)]
         [InlineData(true, "theirs-only.txt", true, false, FileStatus.Nonexistent, 1)]
-        [InlineData(false, "theirs-only.txt", true, true, FileStatus.Untracked, 1)]
+        [InlineData(false, "theirs-only.txt", true, true, FileStatus.NewInWorkdir, 1)]
         public void CanResolveConflictsByRemovingFromTheIndex(
             bool removeFromWorkdir, string filename, bool existsBeforeRemove, bool existsAfterRemove, FileStatus lastStatus, int removedIndexEntries)
         {
diff --git a/LibGit2Sharp.Tests/DiffTreeToTargetFixture.cs b/LibGit2Sharp.Tests/DiffTreeToTargetFixture.cs
index b5de35e5..da48dbc6 100644
--- a/LibGit2Sharp.Tests/DiffTreeToTargetFixture.cs
+++ b/LibGit2Sharp.Tests/DiffTreeToTargetFixture.cs
@@ -163,7 +163,7 @@ namespace LibGit2Sharp.Tests
                 File.Move(fullpath + ".bak", fullpath);
 
                 FileStatus state = repo.RetrieveStatus("file.txt");
-                Assert.Equal(FileStatus.Removed | FileStatus.Untracked, state);
+                Assert.Equal(FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, state);
 
                 var wrkDirToIdxToTree = repo.Diff.Compare<TreeChanges>(repo.Head.Tip.Tree,
                     DiffTargets.Index | DiffTargets.WorkingDirectory);
diff --git a/LibGit2Sharp.Tests/DiffWorkdirToIndexFixture.cs b/LibGit2Sharp.Tests/DiffWorkdirToIndexFixture.cs
index c16fd988..65f07582 100644
--- a/LibGit2Sharp.Tests/DiffWorkdirToIndexFixture.cs
+++ b/LibGit2Sharp.Tests/DiffWorkdirToIndexFixture.cs
@@ -42,7 +42,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
         [InlineData("really-i-cant-exist.txt", FileStatus.Nonexistent)]
         public void CanCompareTheWorkDirAgainstTheIndexWithLaxUnmatchedExplicitPathsValidation(string relativePath, FileStatus currentStatus)
         {
@@ -60,7 +60,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
         [InlineData("really-i-cant-exist.txt", FileStatus.Nonexistent)]
         public void ComparingTheWorkDirAgainstTheIndexWithStrictUnmatchedExplicitPathsValidationAndANonExistentPathspecThrows(string relativePath, FileStatus currentStatus)
         {
@@ -74,7 +74,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
         [InlineData("where-am-I.txt", FileStatus.Nonexistent)]
         public void CallbackForUnmatchedExplicitPathsIsCalledWhenSet(string relativePath, FileStatus currentStatus)
         {
diff --git a/LibGit2Sharp.Tests/IndexFixture.cs b/LibGit2Sharp.Tests/IndexFixture.cs
index 60760c99..0b0f4255 100644
--- a/LibGit2Sharp.Tests/IndexFixture.cs
+++ b/LibGit2Sharp.Tests/IndexFixture.cs
@@ -101,10 +101,10 @@ namespace LibGit2Sharp.Tests
                 Assert.Equal(FileStatus.Nonexistent, repo.RetrieveStatus(oldName));
 
                 Touch(repo.Info.WorkingDirectory, oldName, "hello test file\n");
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(oldName));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(oldName));
 
                 repo.Stage(oldName);
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(oldName));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(oldName));
 
                 // Generated through
                 // $ echo "hello test file" | git hash-object --stdin
@@ -121,8 +121,8 @@ namespace LibGit2Sharp.Tests
                 const string newName = "being.frakking.polite.txt";
 
                 repo.Move(oldName, newName);
-                Assert.Equal(FileStatus.Removed, repo.RetrieveStatus(oldName));
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(newName));
+                Assert.Equal(FileStatus.DeletedFromIndex, repo.RetrieveStatus(oldName));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(newName));
 
                 Assert.Equal(1, repo.Index.Count);
                 Assert.Equal(expectedHash, repo.Index[newName].Id.Sha);
@@ -138,10 +138,10 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("README", FileStatus.Unaltered, "deleted_unstaged_file.txt", FileStatus.Missing, FileStatus.Removed, FileStatus.Staged)]
-        [InlineData("new_tracked_file.txt", FileStatus.Added, "deleted_unstaged_file.txt", FileStatus.Missing, FileStatus.Nonexistent, FileStatus.Staged)]
-        [InlineData("modified_staged_file.txt", FileStatus.Staged, "deleted_unstaged_file.txt", FileStatus.Missing, FileStatus.Removed, FileStatus.Staged)]
-        [InlineData("modified_unstaged_file.txt", FileStatus.Modified, "deleted_unstaged_file.txt", FileStatus.Missing, FileStatus.Removed, FileStatus.Staged)]
+        [InlineData("README", FileStatus.Unaltered, "deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, FileStatus.DeletedFromIndex, FileStatus.ModifiedInIndex)]
+        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex, "deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, FileStatus.Nonexistent, FileStatus.ModifiedInIndex)]
+        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex, "deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, FileStatus.DeletedFromIndex, FileStatus.ModifiedInIndex)]
+        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir, "deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, FileStatus.DeletedFromIndex, FileStatus.ModifiedInIndex)]
         public void CanMoveAnExistingFileOverANonExistingFile(string sourcePath, FileStatus sourceStatus, string destPath, FileStatus destStatus, FileStatus sourcePostStatus, FileStatus destPostStatus)
         {
             string path = SandboxStandardTestRepo();
@@ -159,24 +159,24 @@ namespace LibGit2Sharp.Tests
 
         [Theory]
         [InlineData("README", FileStatus.Unaltered, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("new_tracked_file.txt", FileStatus.Added, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("modified_staged_file.txt", FileStatus.Staged, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("modified_unstaged_file.txt", FileStatus.Modified, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
+        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
+        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
+        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
         public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
         {
             InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
         public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
         {
             InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
         }
 
         [Theory]
-        [InlineData("deleted_unstaged_file.txt", FileStatus.Missing, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        [InlineData("deleted_staged_file.txt", FileStatus.Removed, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
+        [InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
         [InlineData("i_dont_exist.txt", FileStatus.Nonexistent, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
         public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
         {
@@ -300,20 +300,20 @@ namespace LibGit2Sharp.Tests
                 const string headIndexTreeSha = "e5d221fc5da11a3169bf503d76497c81be3207b6";
 
                 Assert.True(repo.Index.IsFullyMerged);
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(testFile));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(testFile));
 
                 var headIndexTree = repo.Lookup<Tree>(headIndexTreeSha);
                 Assert.NotNull(headIndexTree);
                 repo.Index.Replace(headIndexTree);
 
                 Assert.True(repo.Index.IsFullyMerged);
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(testFile));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(testFile));
             }
 
             // Check that the index was persisted to disk.
             using (var repo = new Repository(path))
             {
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(testFile));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(testFile));
             }
         }
 
@@ -331,20 +331,20 @@ namespace LibGit2Sharp.Tests
                 const string headIndexTreeSha = "1cb365141a52dfbb24933515820eb3045fbca12b";
 
                 Assert.False(repo.Index.IsFullyMerged);
-                Assert.Equal(FileStatus.Staged, repo.RetrieveStatus(testFile));
+                Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus(testFile));
 
                 var headIndexTree = repo.Lookup<Tree>(headIndexTreeSha);
                 Assert.NotNull(headIndexTree);
                 repo.Index.Replace(headIndexTree);
 
                 Assert.True(repo.Index.IsFullyMerged);
-                Assert.Equal(FileStatus.Modified, repo.RetrieveStatus(testFile));
+                Assert.Equal(FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(testFile));
             }
 
             // Check that the index was persisted to disk.
             using (var repo = new Repository(path))
             {
-                Assert.Equal(FileStatus.Modified, repo.RetrieveStatus(testFile));
+                Assert.Equal(FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(testFile));
             }
         }
 
@@ -364,19 +364,19 @@ namespace LibGit2Sharp.Tests
                 repo.Index.Clear();
                 Assert.Equal(0, repo.Index.Count);
 
-                Assert.Equal(FileStatus.Removed | FileStatus.Untracked, repo.RetrieveStatus(testFile));
+                Assert.Equal(FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, repo.RetrieveStatus(testFile));
             }
 
             // Check that the index was persisted to disk.
             using (var repo = new Repository(path))
             {
-                Assert.Equal(FileStatus.Removed | FileStatus.Untracked, repo.RetrieveStatus(testFile));
+                Assert.Equal(FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir, repo.RetrieveStatus(testFile));
             }
         }
 
         [Theory]
-        [InlineData("new_tracked_file.txt", FileStatus.Added, FileStatus.Untracked)]
-        [InlineData("modified_staged_file.txt", FileStatus.Staged, FileStatus.Removed | FileStatus.Untracked)]
+        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex, FileStatus.NewInWorkdir)]
+        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex, FileStatus.DeletedFromIndex | FileStatus.NewInWorkdir)]
         [InlineData("i_dont_exist.txt", FileStatus.Nonexistent, FileStatus.Nonexistent)]
         public void CanRemoveAnEntryFromTheIndex(string pathInTheIndex, FileStatus expectedBeforeStatus, FileStatus expectedAfterStatus)
         {
@@ -394,8 +394,8 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked, FileStatus.Added)]
-        [InlineData("modified_unstaged_file.txt", FileStatus.Modified, FileStatus.Staged)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir, FileStatus.NewInIndex)]
+        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir, FileStatus.ModifiedInIndex)]
         public void CanAddAnEntryToTheIndexFromAFileInTheWorkdir(string pathInTheWorkdir, FileStatus expectedBeforeStatus, FileStatus expectedAfterStatus)
         {
             var path = SandboxStandardTestRepoGitDir();
@@ -426,7 +426,7 @@ namespace LibGit2Sharp.Tests
                 repo.Index.Add(blob, targetIndexEntryPath, Mode.NonExecutableFile);
 
                 var after = repo.RetrieveStatus(targetIndexEntryPath);
-                Assert.Equal(FileStatus.Staged | FileStatus.Modified, after);
+                Assert.Equal(FileStatus.ModifiedInIndex | FileStatus.ModifiedInWorkdir, after);
             }
         }
 
@@ -451,18 +451,18 @@ namespace LibGit2Sharp.Tests
             using (var repo = new Repository(path))
             {
                 var before = repo.RetrieveStatus();
-                Assert.True(before.Any(se => se.State == FileStatus.Untracked));
-                Assert.True(before.Any(se => se.State == FileStatus.Modified));
-                Assert.True(before.Any(se => se.State == FileStatus.Missing));
+                Assert.True(before.Any(se => se.State == FileStatus.NewInWorkdir));
+                Assert.True(before.Any(se => se.State == FileStatus.ModifiedInWorkdir));
+                Assert.True(before.Any(se => se.State == FileStatus.DeletedFromWorkdir));
 
                 AddSomeCornerCases(repo);
 
                 repo.Stage("*");
 
                 var after = repo.RetrieveStatus();
-                Assert.False(after.Any(se => se.State == FileStatus.Untracked));
-                Assert.False(after.Any(se => se.State == FileStatus.Modified));
-                Assert.False(after.Any(se => se.State == FileStatus.Missing));
+                Assert.False(after.Any(se => se.State == FileStatus.NewInWorkdir));
+                Assert.False(after.Any(se => se.State == FileStatus.ModifiedInWorkdir));
+                Assert.False(after.Any(se => se.State == FileStatus.DeletedFromWorkdir));
             }
         }
 
diff --git a/LibGit2Sharp.Tests/MergeFixture.cs b/LibGit2Sharp.Tests/MergeFixture.cs
index 202de101..b3bb432b 100644
--- a/LibGit2Sharp.Tests/MergeFixture.cs
+++ b/LibGit2Sharp.Tests/MergeFixture.cs
@@ -503,7 +503,7 @@ namespace LibGit2Sharp.Tests
 
                 // Verify that there is a staged entry.
                 Assert.Equal(1, repoStatus.Count());
-                Assert.Equal(FileStatus.Staged, repo.RetrieveStatus("b.txt"));
+                Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus("b.txt"));
             }
         }
 
diff --git a/LibGit2Sharp.Tests/ObjectDatabaseFixture.cs b/LibGit2Sharp.Tests/ObjectDatabaseFixture.cs
index 71c93c76..62c4a67a 100644
--- a/LibGit2Sharp.Tests/ObjectDatabaseFixture.cs
+++ b/LibGit2Sharp.Tests/ObjectDatabaseFixture.cs
@@ -41,7 +41,7 @@ namespace LibGit2Sharp.Tests
                 Assert.Equal("dc53d4c6b8684c21b0b57db29da4a2afea011565", blob.Sha);
 
                 /* The file is unknown from the Index nor the Head ... */
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus("hello.txt"));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus("hello.txt"));
 
                 /* ...however, it's indeed stored in the repository. */
                 var fetchedBlob = repo.Lookup<Blob>(blob.Id);
diff --git a/LibGit2Sharp.Tests/RemoveFixture.cs b/LibGit2Sharp.Tests/RemoveFixture.cs
index 52a3aba0..94a376da 100644
--- a/LibGit2Sharp.Tests/RemoveFixture.cs
+++ b/LibGit2Sharp.Tests/RemoveFixture.cs
@@ -14,36 +14,36 @@ namespace LibGit2Sharp.Tests
          *   'git rm --cached <file>' works (file removed only from index).
          *   'git rm <file>' works (file removed from both index and workdir).
          */
-        [InlineData(false, "1/branch_file.txt", false, FileStatus.Unaltered, true, true, FileStatus.Untracked | FileStatus.Removed)]
-        [InlineData(true, "1/branch_file.txt", false, FileStatus.Unaltered, true, false, FileStatus.Removed)]
+        [InlineData(false, "1/branch_file.txt", false, FileStatus.Unaltered, true, true, FileStatus.NewInWorkdir | FileStatus.DeletedFromIndex)]
+        [InlineData(true, "1/branch_file.txt", false, FileStatus.Unaltered, true, false, FileStatus.DeletedFromIndex)]
         /***
          * Test case: file exists in the index, and has been removed from the wd.
          *   'git rm <file> and 'git rm --cached <file>' both work (file removed from the index)
          */
-        [InlineData(true, "deleted_unstaged_file.txt", false, FileStatus.Missing, false, false, FileStatus.Removed)]
-        [InlineData(false, "deleted_unstaged_file.txt", false, FileStatus.Missing, false, false, FileStatus.Removed)]
+        [InlineData(true, "deleted_unstaged_file.txt", false, FileStatus.DeletedFromWorkdir, false, false, FileStatus.DeletedFromIndex)]
+        [InlineData(false, "deleted_unstaged_file.txt", false, FileStatus.DeletedFromWorkdir, false, false, FileStatus.DeletedFromIndex)]
         /***
          * Test case: modified file in wd, the modifications have not been promoted to the index yet.
          *   'git rm --cached <file>' works (removes the file from the index)
          *   'git rm <file>' fails ("error: '<file>' has local modifications").
          */
-        [InlineData(false, "modified_unstaged_file.txt", false, FileStatus.Modified, true, true, FileStatus.Untracked | FileStatus.Removed)]
-        [InlineData(true, "modified_unstaged_file.txt", true,  FileStatus.Modified, true, true, 0)]
+        [InlineData(false, "modified_unstaged_file.txt", false, FileStatus.ModifiedInWorkdir, true, true, FileStatus.NewInWorkdir | FileStatus.DeletedFromIndex)]
+        [InlineData(true, "modified_unstaged_file.txt", true,  FileStatus.ModifiedInWorkdir, true, true, 0)]
         /***
          * Test case: modified file in wd, the modifications have already been promoted to the index.
          *   'git rm --cached <file>' works (removes the file from the index)
          *   'git rm <file>' fails ("error: '<file>' has changes staged in the index")
          */
-        [InlineData(false, "modified_staged_file.txt", false, FileStatus.Staged, true, true, FileStatus.Untracked | FileStatus.Removed)]
-        [InlineData(true, "modified_staged_file.txt", true, FileStatus.Staged, true, true, 0)]
+        [InlineData(false, "modified_staged_file.txt", false, FileStatus.ModifiedInIndex, true, true, FileStatus.NewInWorkdir | FileStatus.DeletedFromIndex)]
+        [InlineData(true, "modified_staged_file.txt", true, FileStatus.ModifiedInIndex, true, true, 0)]
         /***
          * Test case: modified file in wd, the modifications have already been promoted to the index, and
          * the file does not exist in the HEAD.
          *   'git rm --cached <file>' works (removes the file from the index)
          *   'git rm <file>' throws ("error: '<file>' has changes staged in the index")
          */
-        [InlineData(false, "new_tracked_file.txt", false, FileStatus.Added, true, true, FileStatus.Untracked)]
-        [InlineData(true, "new_tracked_file.txt", true, FileStatus.Added, true, true, 0)]
+        [InlineData(false, "new_tracked_file.txt", false, FileStatus.NewInIndex, true, true, FileStatus.NewInWorkdir)]
+        [InlineData(true, "new_tracked_file.txt", true, FileStatus.NewInIndex, true, true, 0)]
         public void CanRemoveAnUnalteredFileFromTheIndexWithoutRemovingItFromTheWorkingDirectory(
             bool removeFromWorkdir, string filename, bool throws, FileStatus initialStatus, bool existsBeforeRemove, bool existsAfterRemove, FileStatus lastStatus)
         {
@@ -91,7 +91,7 @@ namespace LibGit2Sharp.Tests
                 Assert.Equal(true, File.Exists(fullpath));
 
                 File.AppendAllText(fullpath, "additional content");
-                Assert.Equal(FileStatus.Staged | FileStatus.Modified, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.ModifiedInIndex | FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(filename));
 
                 Assert.Throws<RemoveFromIndexException>(() => repo.Remove(filename));
                 Assert.Throws<RemoveFromIndexException>(() => repo.Remove(filename, false));
@@ -136,7 +136,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("deleted_staged_file.txt", FileStatus.Removed)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex)]
         [InlineData("1/I-do-not-exist.txt", FileStatus.Nonexistent)]
         public void RemovingAnUnknownFileWithLaxExplicitPathsValidationDoesntThrow(string relativePath, FileStatus status)
         {
@@ -156,7 +156,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("deleted_staged_file.txt", FileStatus.Removed)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex)]
         [InlineData("1/I-do-not-exist.txt", FileStatus.Nonexistent)]
         public void RemovingAnUnknownFileThrowsIfExplicitPath(string relativePath, FileStatus status)
         {
diff --git a/LibGit2Sharp.Tests/RepositoryOptionsFixture.cs b/LibGit2Sharp.Tests/RepositoryOptionsFixture.cs
index 1d207286..496cf302 100644
--- a/LibGit2Sharp.Tests/RepositoryOptionsFixture.cs
+++ b/LibGit2Sharp.Tests/RepositoryOptionsFixture.cs
@@ -35,7 +35,7 @@ namespace LibGit2Sharp.Tests
             using (var repo = new Repository(path, options))
             {
                 var st = repo.RetrieveStatus("1/branch_file.txt");
-                Assert.Equal(FileStatus.Missing, st);
+                Assert.Equal(FileStatus.DeletedFromWorkdir, st);
             }
         }
 
@@ -48,7 +48,7 @@ namespace LibGit2Sharp.Tests
             using (var repo = new Repository(path, options))
             {
                 var st = repo.RetrieveStatus("1/branch_file.txt");
-                Assert.Equal(FileStatus.Removed, st);
+                Assert.Equal(FileStatus.DeletedFromIndex, st);
             }
         }
 
@@ -78,7 +78,7 @@ namespace LibGit2Sharp.Tests
             var path2 = SandboxStandardTestRepo();
             using (var repo = new Repository(path2, options))
             {
-                Assert.Equal(FileStatus.Missing, repo.RetrieveStatus("1/branch_file.txt"));
+                Assert.Equal(FileStatus.DeletedFromWorkdir, repo.RetrieveStatus("1/branch_file.txt"));
             }
         }
 
@@ -88,11 +88,11 @@ namespace LibGit2Sharp.Tests
             var path1 = SandboxStandardTestRepo();
             using (var repo = new Repository(path1))
             {
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus("new_untracked_file.txt"));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus("new_untracked_file.txt"));
 
                 repo.Stage("new_untracked_file.txt");
 
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus("new_untracked_file.txt"));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus("new_untracked_file.txt"));
 
                 File.Copy(Path.Combine(repo.Info.Path, "index"), newIndex);
             }
@@ -102,7 +102,7 @@ namespace LibGit2Sharp.Tests
             var path2 = SandboxStandardTestRepo();
             using (var repo = new Repository(path2, options))
             {
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus("new_untracked_file.txt"));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus("new_untracked_file.txt"));
             }
         }
 
@@ -131,7 +131,7 @@ namespace LibGit2Sharp.Tests
                 Assert.NotEqual(head.Tip.Sha, newHead.Tip.Sha);
                 Assert.Equal(commitSha, newHead.Tip.Sha);
 
-                Assert.Equal(FileStatus.Removed, repo.RetrieveStatus("zomg.txt"));
+                Assert.Equal(FileStatus.DeletedFromIndex, repo.RetrieveStatus("zomg.txt"));
             }
         }
 
diff --git a/LibGit2Sharp.Tests/ResetHeadFixture.cs b/LibGit2Sharp.Tests/ResetHeadFixture.cs
index 9436c98c..4f692191 100644
--- a/LibGit2Sharp.Tests/ResetHeadFixture.cs
+++ b/LibGit2Sharp.Tests/ResetHeadFixture.cs
@@ -115,7 +115,7 @@ namespace LibGit2Sharp.Tests
                 Assert.Equal(expectedHeadName, repo.Head.FriendlyName);
                 Assert.Equal(tag.Target.Id, repo.Head.Tip.Id);
 
-                Assert.Equal(FileStatus.Staged, repo.RetrieveStatus("a.txt"));
+                Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus("a.txt"));
 
                 AssertRefLogEntry(repo, "HEAD",
                                   string.Format("reset: moving to {0}", tag.Target.Sha),
@@ -190,7 +190,7 @@ namespace LibGit2Sharp.Tests
 
                 repo.Reset(ResetMode.Mixed, tag.CanonicalName);
 
-                Assert.Equal(FileStatus.Modified, repo.RetrieveStatus("a.txt"));
+                Assert.Equal(FileStatus.ModifiedInWorkdir, repo.RetrieveStatus("a.txt"));
 
                 AssertRefLogEntry(repo, "HEAD",
                                   string.Format("reset: moving to {0}", tag.Target.Sha),
diff --git a/LibGit2Sharp.Tests/ResetIndexFixture.cs b/LibGit2Sharp.Tests/ResetIndexFixture.cs
index 5e709f61..08256621 100644
--- a/LibGit2Sharp.Tests/ResetIndexFixture.cs
+++ b/LibGit2Sharp.Tests/ResetIndexFixture.cs
@@ -30,17 +30,17 @@ namespace LibGit2Sharp.Tests
 
         private static bool IsStaged(StatusEntry entry)
         {
-            if ((entry.State & FileStatus.Added) == FileStatus.Added)
+            if ((entry.State & FileStatus.NewInIndex) == FileStatus.NewInIndex)
             {
                 return true;
             }
 
-            if ((entry.State & FileStatus.Staged) == FileStatus.Staged)
+            if ((entry.State & FileStatus.ModifiedInIndex) == FileStatus.ModifiedInIndex)
             {
                 return true;
             }
 
-            if ((entry.State & FileStatus.Removed) == FileStatus.Removed)
+            if ((entry.State & FileStatus.DeletedFromIndex) == FileStatus.DeletedFromIndex)
             {
                 return true;
             }
@@ -140,8 +140,8 @@ namespace LibGit2Sharp.Tests
 
                 RepositoryStatus newStatus = repo.RetrieveStatus();
                 Assert.Equal(0, newStatus.RenamedInIndex.Count());
-                Assert.Equal(FileStatus.Missing, newStatus["branch_file.txt"].State);
-                Assert.Equal(FileStatus.Added, newStatus["renamed_branch_file.txt"].State);
+                Assert.Equal(FileStatus.DeletedFromWorkdir, newStatus["branch_file.txt"].State);
+                Assert.Equal(FileStatus.NewInIndex, newStatus["renamed_branch_file.txt"].State);
             }
         }
 
@@ -160,8 +160,8 @@ namespace LibGit2Sharp.Tests
 
                 RepositoryStatus newStatus = repo.RetrieveStatus();
                 Assert.Equal(0, newStatus.RenamedInIndex.Count());
-                Assert.Equal(FileStatus.Untracked, newStatus["renamed_branch_file.txt"].State);
-                Assert.Equal(FileStatus.Removed, newStatus["branch_file.txt"].State);
+                Assert.Equal(FileStatus.NewInWorkdir, newStatus["renamed_branch_file.txt"].State);
+                Assert.Equal(FileStatus.DeletedFromIndex, newStatus["branch_file.txt"].State);
             }
         }
     }
diff --git a/LibGit2Sharp.Tests/RevertFixture.cs b/LibGit2Sharp.Tests/RevertFixture.cs
index 6fe960e6..d01fb6a7 100644
--- a/LibGit2Sharp.Tests/RevertFixture.cs
+++ b/LibGit2Sharp.Tests/RevertFixture.cs
@@ -83,7 +83,7 @@ namespace LibGit2Sharp.Tests
 
                 // Verify workspace is dirty.
                 FileStatus fileStatus = repo.RetrieveStatus(revertedFile);
-                Assert.Equal(FileStatus.Staged, fileStatus);
+                Assert.Equal(FileStatus.ModifiedInIndex, fileStatus);
 
                 // This is the ID of the blob containing the expected content.
                 Blob expectedBlob = repo.Lookup<Blob>("bc90ea420cf6c5ae3db7dcdffa0d79df567f219b");
@@ -131,8 +131,8 @@ namespace LibGit2Sharp.Tests
                 Assert.NotNull(repo.Index.Conflicts["a.txt"]);
 
                 // Verify the non-conflicting paths are staged.
-                Assert.Equal(FileStatus.Staged, repo.RetrieveStatus("b.txt"));
-                Assert.Equal(FileStatus.Staged, repo.RetrieveStatus("c.txt"));
+                Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus("b.txt"));
+                Assert.Equal(FileStatus.ModifiedInIndex, repo.RetrieveStatus("c.txt"));
             }
         }
 
diff --git a/LibGit2Sharp.Tests/StageFixture.cs b/LibGit2Sharp.Tests/StageFixture.cs
index e3ea496a..53438395 100644
--- a/LibGit2Sharp.Tests/StageFixture.cs
+++ b/LibGit2Sharp.Tests/StageFixture.cs
@@ -11,11 +11,11 @@ namespace LibGit2Sharp.Tests
         [Theory]
         [InlineData("1/branch_file.txt", FileStatus.Unaltered, true, FileStatus.Unaltered, true, 0)]
         [InlineData("README", FileStatus.Unaltered, true, FileStatus.Unaltered, true, 0)]
-        [InlineData("deleted_unstaged_file.txt", FileStatus.Missing, true, FileStatus.Removed, false, -1)]
-        [InlineData("modified_unstaged_file.txt", FileStatus.Modified, true, FileStatus.Staged, true, 0)]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked, false, FileStatus.Added, true, 1)]
-        [InlineData("modified_staged_file.txt", FileStatus.Staged, true, FileStatus.Staged, true, 0)]
-        [InlineData("new_tracked_file.txt", FileStatus.Added, true, FileStatus.Added, true, 0)]
+        [InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, true, FileStatus.DeletedFromIndex, false, -1)]
+        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir, true, FileStatus.ModifiedInIndex, true, 0)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir, false, FileStatus.NewInIndex, true, 1)]
+        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex, true, FileStatus.ModifiedInIndex, true, 0)]
+        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex, true, FileStatus.NewInIndex, true, 0)]
         public void CanStage(string relativePath, FileStatus currentStatus, bool doesCurrentlyExistInTheIndex, FileStatus expectedStatusOnceStaged, bool doesExistInTheIndexOnceStaged, int expectedIndexCountVariation)
         {
             string path = SandboxStandardTestRepo();
@@ -43,23 +43,23 @@ namespace LibGit2Sharp.Tests
                 const string filename = "new_tracked_file.txt";
                 IndexEntry blob = repo.Index[filename];
 
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
 
                 Touch(repo.Info.WorkingDirectory, filename, "brand new content");
-                Assert.Equal(FileStatus.Added | FileStatus.Modified, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInIndex | FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(filename));
 
                 repo.Stage(filename);
                 IndexEntry newBlob = repo.Index[filename];
 
                 Assert.Equal(count, repo.Index.Count);
                 Assert.NotEqual(newBlob.Id, blob.Id);
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
             }
         }
 
         [Theory]
         [InlineData("1/I-do-not-exist.txt", FileStatus.Nonexistent)]
-        [InlineData("deleted_staged_file.txt", FileStatus.Removed)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex)]
         public void StagingAnUnknownFileThrowsIfExplicitPath(string relativePath, FileStatus status)
         {
             var path = SandboxStandardTestRepoGitDir();
@@ -74,7 +74,7 @@ namespace LibGit2Sharp.Tests
 
         [Theory]
         [InlineData("1/I-do-not-exist.txt", FileStatus.Nonexistent)]
-        [InlineData("deleted_staged_file.txt", FileStatus.Removed)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex)]
         public void CanStageAnUnknownFileWithLaxUnmatchedExplicitPathsValidation(string relativePath, FileStatus status)
         {
             var path = SandboxStandardTestRepoGitDir();
@@ -92,7 +92,7 @@ namespace LibGit2Sharp.Tests
 
         [Theory]
         [InlineData("1/I-do-not-exist.txt", FileStatus.Nonexistent)]
-        [InlineData("deleted_staged_file.txt", FileStatus.Removed)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex)]
         public void StagingAnUnknownFileWithLaxExplicitPathsValidationDoesntThrow(string relativePath, FileStatus status)
         {
             var path = SandboxStandardTestRepoGitDir();
@@ -116,10 +116,10 @@ namespace LibGit2Sharp.Tests
                 const string filename = "new_tracked_file.txt";
                 Assert.NotNull(repo.Index[filename]);
 
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
 
                 File.Delete(Path.Combine(repo.Info.WorkingDirectory, filename));
-                Assert.Equal(FileStatus.Added | FileStatus.Missing, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInIndex | FileStatus.DeletedFromWorkdir, repo.RetrieveStatus(filename));
 
                 repo.Stage(filename);
                 Assert.Null(repo.Index[filename]);
@@ -142,18 +142,18 @@ namespace LibGit2Sharp.Tests
                 Assert.Null(repo.Index[filename]);
 
                 Touch(repo.Info.WorkingDirectory, filename, "some contents");
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(filename));
                 Assert.Null(repo.Index[filename]);
 
                 repo.Stage(filename);
                 Assert.NotNull(repo.Index[filename]);
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
             }
 
             using (var repo = new Repository(path))
             {
                 Assert.NotNull(repo.Index[filename]);
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
             }
         }
 
@@ -194,9 +194,9 @@ namespace LibGit2Sharp.Tests
             try
             {
                 repo.Stage(path);
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(path));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(path));
                 repo.Index.Replace(repo.Head.Tip);
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(path));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(path));
             }
             catch (ArgumentException)
             {
@@ -331,7 +331,7 @@ namespace LibGit2Sharp.Tests
 
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(path));
                 repo.Stage(path, new StageOptions { IncludeIgnored = true });
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(path));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(path));
             }
         }
     }
diff --git a/LibGit2Sharp.Tests/StashFixture.cs b/LibGit2Sharp.Tests/StashFixture.cs
index c9f94064..c630d574 100644
--- a/LibGit2Sharp.Tests/StashFixture.cs
+++ b/LibGit2Sharp.Tests/StashFixture.cs
@@ -150,7 +150,7 @@ namespace LibGit2Sharp.Tests
                 Assert.NotNull(stash.Index[staged]);
 
                 //It should leave untracked files untracked
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus(untracked));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus(untracked));
                 Assert.Null(stash.Untracked);
             }
         }
@@ -171,7 +171,7 @@ namespace LibGit2Sharp.Tests
 
                 Assert.NotNull(stash);
                 Assert.NotNull(stash.Index[filename]);
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(filename));
                 Assert.Null(stash.Untracked);
             }
         }
diff --git a/LibGit2Sharp.Tests/StatusFixture.cs b/LibGit2Sharp.Tests/StatusFixture.cs
index 476dab8b..773eb7e4 100644
--- a/LibGit2Sharp.Tests/StatusFixture.cs
+++ b/LibGit2Sharp.Tests/StatusFixture.cs
@@ -17,13 +17,13 @@ namespace LibGit2Sharp.Tests
             using (var repo = new Repository(path))
             {
                 FileStatus status = repo.RetrieveStatus("new_tracked_file.txt");
-                Assert.Equal(FileStatus.Added, status);
+                Assert.Equal(FileStatus.NewInIndex, status);
             }
         }
 
         [Theory]
-        [InlineData(StatusShowOption.IndexAndWorkDir, FileStatus.Untracked)]
-        [InlineData(StatusShowOption.WorkDirOnly, FileStatus.Untracked)]
+        [InlineData(StatusShowOption.IndexAndWorkDir, FileStatus.NewInWorkdir)]
+        [InlineData(StatusShowOption.WorkDirOnly, FileStatus.NewInWorkdir)]
         [InlineData(StatusShowOption.IndexOnly, FileStatus.Nonexistent)]
         public void CanLimitStatusToWorkDirOnly(StatusShowOption show, FileStatus expected)
         {
@@ -39,9 +39,9 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData(StatusShowOption.IndexAndWorkDir, FileStatus.Added)]
+        [InlineData(StatusShowOption.IndexAndWorkDir, FileStatus.NewInIndex)]
         [InlineData(StatusShowOption.WorkDirOnly, FileStatus.Nonexistent)]
-        [InlineData(StatusShowOption.IndexOnly, FileStatus.Added)]
+        [InlineData(StatusShowOption.IndexOnly, FileStatus.NewInIndex)]
         public void CanLimitStatusToIndexOnly(StatusShowOption show, FileStatus expected)
         {
             var clone = SandboxStandardTestRepo();
@@ -89,7 +89,7 @@ namespace LibGit2Sharp.Tests
                 Touch(repo.Info.WorkingDirectory, filePath, "content");
 
                 FileStatus status = repo.RetrieveStatus(filePath);
-                Assert.Equal(FileStatus.Untracked, status);
+                Assert.Equal(FileStatus.NewInWorkdir, status);
             }
         }
 
@@ -115,7 +115,7 @@ namespace LibGit2Sharp.Tests
 
                 RepositoryStatus status = repo.RetrieveStatus(new StatusOptions() { IncludeUnaltered = includeUnaltered });
 
-                Assert.Equal(FileStatus.Staged, status[file].State);
+                Assert.Equal(FileStatus.ModifiedInIndex, status[file].State);
 
                 Assert.NotNull(status);
                 Assert.Equal(6 + unalteredCount, status.Count());
@@ -131,10 +131,10 @@ namespace LibGit2Sharp.Tests
                 File.AppendAllText(Path.Combine(repo.Info.WorkingDirectory, file),
                                    "Tclem's favorite commit message: boom");
 
-                Assert.Equal(FileStatus.Staged | FileStatus.Modified, repo.RetrieveStatus(file));
+                Assert.Equal(FileStatus.ModifiedInIndex | FileStatus.ModifiedInWorkdir, repo.RetrieveStatus(file));
 
                 RepositoryStatus status2 = repo.RetrieveStatus(new StatusOptions() { IncludeUnaltered = includeUnaltered });
-                Assert.Equal(FileStatus.Staged | FileStatus.Modified, status2[file].State);
+                Assert.Equal(FileStatus.ModifiedInIndex | FileStatus.ModifiedInWorkdir, status2[file].State);
 
                 Assert.NotNull(status2);
                 Assert.Equal(6 + unalteredCount, status2.Count());
@@ -173,7 +173,7 @@ namespace LibGit2Sharp.Tests
                         DetectRenamesInWorkDir = true
                     });
 
-                Assert.Equal(FileStatus.Added | FileStatus.RenamedInWorkDir, status["rename_target.txt"].State);
+                Assert.Equal(FileStatus.NewInIndex | FileStatus.RenamedInWorkdir, status["rename_target.txt"].State);
                 Assert.Equal(100, status["rename_target.txt"].IndexToWorkDirRenameDetails.Similarity);
             }
         }
@@ -225,7 +225,7 @@ namespace LibGit2Sharp.Tests
                 RepositoryStatus status = repo.RetrieveStatus(opts);
 
                 // This passes as expected
-                Assert.Equal(FileStatus.RenamedInWorkDir, status.Single().State);
+                Assert.Equal(FileStatus.RenamedInWorkdir, status.Single().State);
 
                 repo.Stage("file.txt");
                 repo.Stage("renamed.txt");
@@ -239,7 +239,7 @@ namespace LibGit2Sharp.Tests
 
                 status = repo.RetrieveStatus(opts);
 
-                Assert.Equal(FileStatus.RenamedInWorkDir | FileStatus.RenamedInIndex,
+                Assert.Equal(FileStatus.RenamedInWorkdir | FileStatus.RenamedInIndex,
                     status.Single().State);
             }
         }
@@ -409,7 +409,7 @@ namespace LibGit2Sharp.Tests
 
         [Theory]
         [InlineData(true, FileStatus.Unaltered, FileStatus.Unaltered)]
-        [InlineData(false, FileStatus.Missing, FileStatus.Untracked)]
+        [InlineData(false, FileStatus.DeletedFromWorkdir, FileStatus.NewInWorkdir)]
         public void RetrievingTheStatusOfAFilePathHonorsTheIgnoreCaseConfigurationSetting(
             bool shouldIgnoreCase,
             FileStatus expectedlowerCasedFileStatus,
@@ -484,7 +484,7 @@ namespace LibGit2Sharp.Tests
                 Touch(repo.Info.WorkingDirectory, gitIgnore, sb.ToString());
 
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus("bin/look-ma.txt"));
-                Assert.Equal(FileStatus.Untracked, repo.RetrieveStatus("bin/what-about-me.txt"));
+                Assert.Equal(FileStatus.NewInWorkdir, repo.RetrieveStatus("bin/what-about-me.txt"));
 
                 newStatus = repo.RetrieveStatus();
 
diff --git a/LibGit2Sharp.Tests/UnstageFixture.cs b/LibGit2Sharp.Tests/UnstageFixture.cs
index b511d651..ac73cf38 100644
--- a/LibGit2Sharp.Tests/UnstageFixture.cs
+++ b/LibGit2Sharp.Tests/UnstageFixture.cs
@@ -51,7 +51,7 @@ namespace LibGit2Sharp.Tests
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(relativePath));
 
                 repo.Stage(relativePath, new StageOptions { IncludeIgnored = true });
-                Assert.Equal(FileStatus.Added, repo.RetrieveStatus(relativePath));
+                Assert.Equal(FileStatus.NewInIndex, repo.RetrieveStatus(relativePath));
 
                 repo.Unstage(relativePath);
                 Assert.Equal(FileStatus.Ignored, repo.RetrieveStatus(relativePath));
@@ -60,11 +60,11 @@ namespace LibGit2Sharp.Tests
 
         [Theory]
         [InlineData("1/branch_file.txt", FileStatus.Unaltered, true, FileStatus.Unaltered, true, 0)]
-        [InlineData("deleted_unstaged_file.txt", FileStatus.Missing, true, FileStatus.Missing, true, 0)]
-        [InlineData("modified_unstaged_file.txt", FileStatus.Modified, true, FileStatus.Modified, true, 0)]
-        [InlineData("modified_staged_file.txt", FileStatus.Staged, true, FileStatus.Modified, true, 0)]
-        [InlineData("new_tracked_file.txt", FileStatus.Added, true, FileStatus.Untracked, false, -1)]
-        [InlineData("deleted_staged_file.txt", FileStatus.Removed, false, FileStatus.Missing, true, 1)]
+        [InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, true, FileStatus.DeletedFromWorkdir, true, 0)]
+        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir, true, FileStatus.ModifiedInWorkdir, true, 0)]
+        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex, true, FileStatus.ModifiedInWorkdir, true, 0)]
+        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex, true, FileStatus.NewInWorkdir, false, -1)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex, false, FileStatus.DeletedFromWorkdir, true, 1)]
         public void CanUnstage(
             string relativePath, FileStatus currentStatus, bool doesCurrentlyExistInTheIndex,
             FileStatus expectedStatusOnceStaged, bool doesExistInTheIndexOnceStaged, int expectedIndexCountVariation)
@@ -85,7 +85,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
         [InlineData("where-am-I.txt", FileStatus.Nonexistent)]
         public void UnstagingUnknownPathsWithStrictUnmatchedExplicitPathsValidationThrows(string relativePath, FileStatus currentStatus)
         {
@@ -98,7 +98,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
         [InlineData("where-am-I.txt", FileStatus.Nonexistent)]
         public void CanUnstageUnknownPathsWithLaxUnmatchedExplicitPathsValidation(string relativePath, FileStatus currentStatus)
         {
@@ -124,12 +124,12 @@ namespace LibGit2Sharp.Tests
                 string fullPath = Path.Combine(repo.Info.WorkingDirectory, filename);
                 Assert.False(File.Exists(fullPath));
 
-                Assert.Equal(FileStatus.Removed, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.DeletedFromIndex, repo.RetrieveStatus(filename));
 
                 repo.Unstage(filename);
                 Assert.Equal(count + 1, repo.Index.Count);
 
-                Assert.Equal(FileStatus.Missing, repo.RetrieveStatus(filename));
+                Assert.Equal(FileStatus.DeletedFromWorkdir, repo.RetrieveStatus(filename));
             }
         }
 
@@ -155,7 +155,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
         [InlineData("where-am-I.txt", FileStatus.Nonexistent)]
         public void UnstagingUnknownPathsAgainstAnOrphanedHeadWithStrictUnmatchedExplicitPathsValidationThrows(string relativePath, FileStatus currentStatus)
         {
@@ -171,7 +171,7 @@ namespace LibGit2Sharp.Tests
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.Untracked)]
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
         [InlineData("where-am-I.txt", FileStatus.Nonexistent)]
         public void CanUnstageUnknownPathsAgainstAnOrphanedHeadWithLaxUnmatchedExplicitPathsValidation(string relativePath, FileStatus currentStatus)
         {
@@ -251,8 +251,8 @@ namespace LibGit2Sharp.Tests
 
                 RepositoryStatus newStatus = repo.RetrieveStatus();
                 Assert.Equal(0, newStatus.RenamedInIndex.Count());
-                Assert.Equal(FileStatus.Missing, newStatus["branch_file.txt"].State);
-                Assert.Equal(FileStatus.Added, newStatus["renamed_branch_file.txt"].State);
+                Assert.Equal(FileStatus.DeletedFromWorkdir, newStatus["branch_file.txt"].State);
+                Assert.Equal(FileStatus.NewInIndex, newStatus["renamed_branch_file.txt"].State);
             }
         }
 
@@ -271,8 +271,8 @@ namespace LibGit2Sharp.Tests
 
                 RepositoryStatus newStatus = repo.RetrieveStatus();
                 Assert.Equal(0, newStatus.RenamedInIndex.Count());
-                Assert.Equal(FileStatus.Untracked, newStatus["renamed_branch_file.txt"].State);
-                Assert.Equal(FileStatus.Removed, newStatus["branch_file.txt"].State);
+                Assert.Equal(FileStatus.NewInWorkdir, newStatus["renamed_branch_file.txt"].State);
+                Assert.Equal(FileStatus.DeletedFromIndex, newStatus["branch_file.txt"].State);
             }
         }
 
@@ -285,8 +285,8 @@ namespace LibGit2Sharp.Tests
                 repo.Unstage(new string[] { "branch_file.txt", "renamed_branch_file.txt" });
 
                 RepositoryStatus status = repo.RetrieveStatus();
-                Assert.Equal(FileStatus.Missing, status["branch_file.txt"].State);
-                Assert.Equal(FileStatus.Untracked, status["renamed_branch_file.txt"].State);
+                Assert.Equal(FileStatus.DeletedFromWorkdir, status["branch_file.txt"].State);
+                Assert.Equal(FileStatus.NewInWorkdir, status["renamed_branch_file.txt"].State);
             }
         }
     }
diff --git a/LibGit2Sharp/FileStatus.cs b/LibGit2Sharp/FileStatus.cs
index 68e41b7b..191972f3 100644
--- a/LibGit2Sharp/FileStatus.cs
+++ b/LibGit2Sharp/FileStatus.cs
@@ -21,19 +21,37 @@ namespace LibGit2Sharp
         /// <summary>
         /// New file has been added to the Index. It's unknown from the Head.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use NewInIndex instead.")]
         Added = (1 << 0), /* GIT_STATUS_INDEX_NEW */
 
         /// <summary>
+        /// New file has been added to the Index. It's unknown from the Head.
+        /// </summary>
+        NewInIndex = (1 << 0), /* GIT_STATUS_INDEX_NEW */
+
+        /// <summary>
         /// New version of a file has been added to the Index. A previous version exists in the Head.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use ModifiedInIndex instead.")]
         Staged = (1 << 1), /* GIT_STATUS_INDEX_MODIFIED */
 
         /// <summary>
+        /// New version of a file has been added to the Index. A previous version exists in the Head.
+        /// </summary>
+        ModifiedInIndex = (1 << 1), /* GIT_STATUS_INDEX_MODIFIED */
+
+        /// <summary>
         /// The deletion of a file has been promoted from the working directory to the Index. A previous version exists in the Head.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use DeletedFromIndex instead.")]
         Removed = (1 << 2), /* GIT_STATUS_INDEX_DELETED */
 
         /// <summary>
+        /// The deletion of a file has been promoted from the working directory to the Index. A previous version exists in the Head.
+        /// </summary>
+        DeletedFromIndex = (1 << 2), /* GIT_STATUS_INDEX_DELETED */
+
+        /// <summary>
         /// The renaming of a file has been promoted from the working directory to the Index. A previous version exists in the Head.
         /// </summary>
         RenamedInIndex = (1 << 3), /* GIT_STATUS_INDEX_RENAMED */
@@ -41,32 +59,62 @@ namespace LibGit2Sharp
         /// <summary>
         /// A change in type for a file has been promoted from the working directory to the Index. A previous version exists in the Head.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use TypeChangeInIndex instead.")]
         StagedTypeChange = (1 << 4), /* GIT_STATUS_INDEX_TYPECHANGE */
 
         /// <summary>
+        /// A change in type for a file has been promoted from the working directory to the Index. A previous version exists in the Head.
+        /// </summary>
+        TypeChangeInIndex = (1 << 4), /* GIT_STATUS_INDEX_TYPECHANGE */
+
+        /// <summary>
         /// New file in the working directory, unknown from the Index and the Head.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use NewInWorkdir instead.")]
         Untracked = (1 << 7), /* GIT_STATUS_WT_NEW */
 
         /// <summary>
+        /// New file in the working directory, unknown from the Index and the Head.
+        /// </summary>
+        NewInWorkdir = (1 << 7), /* GIT_STATUS_WT_NEW */
+
+        /// <summary>
         /// The file has been updated in the working directory. A previous version exists in the Index.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use ModifiedInWorkdir instead.")]
         Modified = (1 << 8), /* GIT_STATUS_WT_MODIFIED */
 
         /// <summary>
+        /// The file has been updated in the working directory. A previous version exists in the Index.
+        /// </summary>
+        ModifiedInWorkdir = (1 << 8), /* GIT_STATUS_WT_MODIFIED */
+
+        /// <summary>
         /// The file has been deleted from the working directory. A previous version exists in the Index.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use DeletedFromWorkdir instead.")]
         Missing = (1 << 9), /* GIT_STATUS_WT_DELETED */
 
         /// <summary>
+        /// The file has been deleted from the working directory. A previous version exists in the Index.
+        /// </summary>
+        DeletedFromWorkdir = (1 << 9), /* GIT_STATUS_WT_DELETED */
+
+        /// <summary>
         /// The file type has been changed in the working directory. A previous version exists in the Index.
         /// </summary>
+        [Obsolete("This enum member will be removed in the next release. Please use TypeChangeInWorkdir instead.")]
         TypeChanged = (1 << 10), /* GIT_STATUS_WT_TYPECHANGE */
 
         /// <summary>
+        /// The file type has been changed in the working directory. A previous version exists in the Index.
+        /// </summary>
+        TypeChangeInWorkdir = (1 << 10), /* GIT_STATUS_WT_TYPECHANGE */
+
+        /// <summary>
         /// The file has been renamed in the working directory.  The previous version at the previous name exists in the Index.
         /// </summary>
-        RenamedInWorkDir = (1 << 11), /* GIT_STATUS_WT_RENAMED */
+        RenamedInWorkdir = (1 << 11), /* GIT_STATUS_WT_RENAMED */
 
         /// <summary>
         /// The file is unreadable in the working directory.
@@ -74,7 +122,7 @@ namespace LibGit2Sharp
         Unreadable = (1 << 12), /* GIT_STATUS_WT_UNREADABLE */
 
         /// <summary>
-        /// The file is <see cref="Untracked"/> but its name and/or path matches an exclude pattern in a <c>gitignore</c> file.
+        /// The file is <see cref="NewInWorkdir"/> but its name and/or path matches an exclude pattern in a <c>gitignore</c> file.
         /// </summary>
         Ignored = (1 << 14), /* GIT_STATUS_IGNORED */
     }
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
index 247d67ed..189a3cf3 100644
--- a/LibGit2Sharp/Repository.cs
+++ b/LibGit2Sharp/Repository.cs
@@ -1774,13 +1774,13 @@ namespace LibGit2Sharp
                 }
 
                 FileStatus sourceStatus = keyValuePair.Key.Item2;
-                if (sourceStatus.HasAny(new Enum[] { FileStatus.Nonexistent, FileStatus.Removed, FileStatus.Untracked, FileStatus.Missing }))
+                if (sourceStatus.HasAny(new Enum[] { FileStatus.Nonexistent, FileStatus.DeletedFromIndex, FileStatus.NewInWorkdir, FileStatus.DeletedFromWorkdir }))
                 {
                     throw new LibGit2SharpException(string.Format(CultureInfo.InvariantCulture, "Unable to move file '{0}'. Its current status is '{1}'.", sourcePath, sourceStatus));
                 }
 
                 FileStatus desStatus = keyValuePair.Value.Item2;
-                if (desStatus.HasAny(new Enum[] { FileStatus.Nonexistent, FileStatus.Missing }))
+                if (desStatus.HasAny(new Enum[] { FileStatus.Nonexistent, FileStatus.DeletedFromWorkdir }))
                 {
                     continue;
                 }
@@ -2015,8 +2015,8 @@ namespace LibGit2Sharp
 
                     case ChangeKind.Unmodified:
                         if (removeFromWorkingDirectory && (
-                            status.HasFlag(FileStatus.Staged) ||
-                            status.HasFlag(FileStatus.Added) ))
+                            status.HasFlag(FileStatus.ModifiedInIndex) ||
+                            status.HasFlag(FileStatus.NewInIndex) ))
                         {
                             throw new RemoveFromIndexException(string.Format(CultureInfo.InvariantCulture, "Unable to remove file '{0}', as it has changes staged in the index. You can call the Remove() method with removeFromWorkingDirectory=false if you want to remove it from the index only.",
                                 treeEntryChanges.Path));
@@ -2025,7 +2025,7 @@ namespace LibGit2Sharp
                         continue;
 
                     case ChangeKind.Modified:
-                        if (status.HasFlag(FileStatus.Modified) && status.HasFlag(FileStatus.Staged))
+                        if (status.HasFlag(FileStatus.ModifiedInWorkdir) && status.HasFlag(FileStatus.ModifiedInIndex))
                         {
                             throw new RemoveFromIndexException(string.Format(CultureInfo.InvariantCulture, "Unable to remove file '{0}', as it has staged content different from both the working directory and the HEAD.",
                                 treeEntryChanges.Path));
diff --git a/LibGit2Sharp/RepositoryStatus.cs b/LibGit2Sharp/RepositoryStatus.cs
index d5e82ef4..56a1c8dd 100644
--- a/LibGit2Sharp/RepositoryStatus.cs
+++ b/LibGit2Sharp/RepositoryStatus.cs
@@ -35,15 +35,15 @@ namespace LibGit2Sharp
         {
             return new Dictionary<FileStatus, Action<RepositoryStatus, StatusEntry>>
                        {
-                           { FileStatus.Untracked, (rs, s) => rs.untracked.Add(s) },
-                           { FileStatus.Modified, (rs, s) => rs.modified.Add(s) },
-                           { FileStatus.Missing, (rs, s) => rs.missing.Add(s) },
-                           { FileStatus.Added, (rs, s) => rs.added.Add(s) },
-                           { FileStatus.Staged, (rs, s) => rs.staged.Add(s) },
-                           { FileStatus.Removed, (rs, s) => rs.removed.Add(s) },
+                           { FileStatus.NewInWorkdir, (rs, s) => rs.untracked.Add(s) },
+                           { FileStatus.ModifiedInWorkdir, (rs, s) => rs.modified.Add(s) },
+                           { FileStatus.DeletedFromWorkdir, (rs, s) => rs.missing.Add(s) },
+                           { FileStatus.NewInIndex, (rs, s) => rs.added.Add(s) },
+                           { FileStatus.ModifiedInIndex, (rs, s) => rs.staged.Add(s) },
+                           { FileStatus.DeletedFromIndex, (rs, s) => rs.removed.Add(s) },
                            { FileStatus.RenamedInIndex, (rs, s) => rs.renamedInIndex.Add(s) },
                            { FileStatus.Ignored, (rs, s) => rs.ignored.Add(s) },
-                           { FileStatus.RenamedInWorkDir, (rs, s) => rs.renamedInWorkDir.Add(s) },
+                           { FileStatus.RenamedInWorkdir, (rs, s) => rs.renamedInWorkDir.Add(s) },
                        };
         }
 
@@ -157,7 +157,7 @@ namespace LibGit2Sharp
                     (int)deltaHeadToIndex.Similarity);
             }
 
-            if ((gitStatus & FileStatus.RenamedInWorkDir) == FileStatus.RenamedInWorkDir)
+            if ((gitStatus & FileStatus.RenamedInWorkdir) == FileStatus.RenamedInWorkdir)
             {
                 indexToWorkDirRenameDetails = new RenameDetails(
                     LaxFilePathMarshaler.FromNative(deltaIndexToWorkDir.OldFile.Path).Native,
diff --git a/LibGit2Sharp/StatusEntry.cs b/LibGit2Sharp/StatusEntry.cs
index ecf56dbe..1d62a098 100644
--- a/LibGit2Sharp/StatusEntry.cs
+++ b/LibGit2Sharp/StatusEntry.cs
@@ -58,7 +58,7 @@ namespace LibGit2Sharp
         }
 
         /// <summary>
-        /// Gets the rename details from the Index to the working directory, if this <see cref="FileStatus"/> contains <see cref="FileStatus.RenamedInWorkDir"/>
+        /// Gets the rename details from the Index to the working directory, if this <see cref="FileStatus"/> contains <see cref="FileStatus.RenamedInWorkdir"/>
         /// </summary>
         public virtual RenameDetails IndexToWorkDirRenameDetails
         {
@@ -121,7 +121,7 @@ namespace LibGit2Sharp
             get
             {
                 if ((State & FileStatus.RenamedInIndex) == FileStatus.RenamedInIndex ||
-                    (State & FileStatus.RenamedInWorkDir) == FileStatus.RenamedInWorkDir)
+                    (State & FileStatus.RenamedInWorkdir) == FileStatus.RenamedInWorkdir)
                 {
                     string oldFilePath = ((State & FileStatus.RenamedInIndex) == FileStatus.RenamedInIndex) ?
                         HeadToIndexRenameDetails.OldFilePath : IndexToWorkDirRenameDetails.OldFilePath;