diff --git a/libgit2sharp/IResolver.cs b/libgit2sharp/IObjectResolver.cs
similarity index 71%
rename from libgit2sharp/IResolver.cs
rename to libgit2sharp/IObjectResolver.cs
index 48ac1806e79238e7c1233b86be464d03501c4b38..bed1007ec0e9bf5f5cf826cb273702b76900077d 100644
--- a/libgit2sharp/IResolver.cs
+++ b/libgit2sharp/IObjectResolver.cs
@@ -2,7 +2,7 @@
 
 namespace libgit2sharp
 {
-    public interface IResolver
+    public interface IObjectResolver
     {
         object Resolve(string objectId, Type expectedType);
     }
diff --git a/libgit2sharp/ObjectResolver.cs b/libgit2sharp/ObjectResolver.cs
index ff9e05fdd0167fb9bb569e33b04e5aae48ddfcc0..5e6f48e45c2bad4a005cc945876740dbb737dec3 100644
--- a/libgit2sharp/ObjectResolver.cs
+++ b/libgit2sharp/ObjectResolver.cs
@@ -5,7 +5,7 @@
 
 namespace libgit2sharp
 {
-    public class ObjectResolver : IResolver
+    public class ObjectResolver : IObjectResolver
     {
         private readonly IntPtr _repositoryPtr = IntPtr.Zero;
         private readonly IBuilder _builder;
diff --git a/libgit2sharp/Repository.cs b/libgit2sharp/Repository.cs
index 24efd469d89b9677b8439cf22d0639e8d1319d67..68a2953434b062732be936e30e048deabaeb8b58 100644
--- a/libgit2sharp/Repository.cs
+++ b/libgit2sharp/Repository.cs
@@ -4,9 +4,9 @@
 
 namespace libgit2sharp
 {
-    public class Repository : IResolver, IDisposable
+    public class Repository : IObjectResolver, IDisposable
     {
-        private readonly IResolver _resolver;
+        private readonly IObjectResolver _objectResolver;
         private readonly ILifecycleManager _lifecycleManager;
         private readonly IBuilder _builder;
 
@@ -31,7 +31,7 @@ private Repository(ILifecycleManager lifecycleManager)
         {
             _lifecycleManager = lifecycleManager;
             _builder = new ObjectBuilder();
-            _resolver = new ObjectResolver(_lifecycleManager.RepositoryPtr, _builder);
+            _objectResolver = new ObjectResolver(_lifecycleManager.RepositoryPtr, _builder);
         }
 
         public IList<Ref> RetrieveRefs()
@@ -100,7 +100,7 @@ void IDisposable.Dispose()
 
         public object Resolve(string objectId, Type expectedType)
         {
-            return _resolver.Resolve(objectId, expectedType);
+            return _objectResolver.Resolve(objectId, expectedType);
         }
 
         public Tag ApplyTag(string targetId, string tagName, string tagMessage, Signature signature)
diff --git a/libgit2sharp/ResolverExtensions.cs b/libgit2sharp/ResolverExtensions.cs
index 2805fce688f2ff1ad18a1018e4adc428227d77e2..04c23e698ee0510893cfca5548731cfdeab81d69 100644
--- a/libgit2sharp/ResolverExtensions.cs
+++ b/libgit2sharp/ResolverExtensions.cs
@@ -2,14 +2,14 @@
 {
     public static class ResolverExtensions
     {
-        public static GitObject Resolve(this IResolver resolver, string objectId)
+        public static GitObject Resolve(this IObjectResolver objectResolver, string objectId)
         {
-            return resolver.Resolve<GitObject>(objectId);
+            return objectResolver.Resolve<GitObject>(objectId);
         }
 
-        public static TType Resolve<TType>(this IResolver resolver, string objectId)
+        public static TType Resolve<TType>(this IObjectResolver objectResolver, string objectId)
         {
-            return (TType)resolver.Resolve(objectId, typeof(TType));
+            return (TType)objectResolver.Resolve(objectId, typeof(TType));
         }
     }
 }
\ No newline at end of file
diff --git a/libgit2sharp/libgit2sharp.csproj b/libgit2sharp/libgit2sharp.csproj
index 0cc9107486da32dcaf4aab9bb41f192358e667c9..35d5eb7f6bda2b127e9864c6c5d19a2cb910baec 100644
--- a/libgit2sharp/libgit2sharp.csproj
+++ b/libgit2sharp/libgit2sharp.csproj
@@ -47,7 +47,7 @@
     <Compile Include="GitDate.cs" />
     <Compile Include="ILifecycleManager.cs" />
     <Compile Include="Ref.cs" />
-    <Compile Include="IResolver.cs" />
+    <Compile Include="IObjectResolver.cs" />
     <Compile Include="NotAValidRepositoryException.cs" />
     <Compile Include="ObjectId.cs" />
     <Compile Include="ObjectNotFoundException.cs" />