ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [24/40] ignite git commit: ignite-3207 Rename IgniteConfiguration.gridName -> igniteInstanceName.
Date Tue, 14 Mar 2017 15:00:18 GMT
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java
index 17a8c7a..2ce0f89 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTarget.java
@@ -39,7 +39,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     @Override public Collection<Long> findPrimes(Collection<Long> input) {
         return findPrimes0(input);
     }
@@ -50,7 +50,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2)
     @Override public Collection<Long> findPrimesWithoutSplitSize(Collection<Long> input) {
         return findPrimes0(input);
     }
@@ -61,7 +61,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget")
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget")
     @Override public Collection<Long> findPrimesWithoutSplitSizeAndThreshold(Collection<Long> input) {
         return findPrimes0(input);
     }
@@ -72,7 +72,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget")
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget")
     @Override public Collection<Long> findPrimesInListWithoutSplitSizeAndThreshold(List<Long> input) {
         return findPrimes0(input);
     }
@@ -84,7 +84,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @return Prime numbers.
      */
     @SuppressWarnings({"CollectionDeclaredAsConcreteClass"})
-    @GridifySetToSet(gridName = "GridifySetToSetTarget")
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget")
     @Override public Collection<Long> findPrimesInArrayListWithoutSplitSizeAndThreshold(ArrayList<Long> input) {
         return findPrimes0(input);
     }
@@ -95,7 +95,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     @Override public Long[] findPrimesInArray(Long[] input) {
         return findPrimesInArray0(input);
     }
@@ -106,7 +106,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     @Override public long[] findPrimesInPrimitiveArray(long[] input) {
         return findPrimesInPrimitiveArray0(input);
     }
@@ -195,7 +195,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     @Override public Iterator<Long> findPrimesWithIterator(Iterator<Long> input) {
         System.out.println(">>>");
         System.out.println("Find primes in iterator: " + input);
@@ -222,7 +222,7 @@ public class GridifySetToSetTarget implements GridifySetToSetTargetInterface, Se
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     @Override public Enumeration<Long> findPrimesWithEnumeration(Enumeration<Long> input) {
         System.out.println(">>>");
         System.out.println("Find primes in enumeration: " + input);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java
index 592169c..8af7731 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToSetTargetInterface.java
@@ -34,7 +34,7 @@ public interface GridifySetToSetTargetInterface {
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     public Collection<Long> findPrimes(Collection<Long> input);
 
     /**
@@ -43,7 +43,7 @@ public interface GridifySetToSetTargetInterface {
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2)
     public Collection<Long> findPrimesWithoutSplitSize(Collection<Long> input);
 
     /**
@@ -52,7 +52,7 @@ public interface GridifySetToSetTargetInterface {
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget")
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget")
     public Collection<Long> findPrimesWithoutSplitSizeAndThreshold(Collection<Long> input);
 
     /**
@@ -61,7 +61,7 @@ public interface GridifySetToSetTargetInterface {
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget")
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget")
     public Collection<Long> findPrimesInListWithoutSplitSizeAndThreshold(List<Long> input);
 
     /**
@@ -71,7 +71,7 @@ public interface GridifySetToSetTargetInterface {
      * @return Prime numbers.
      */
     @SuppressWarnings({"CollectionDeclaredAsConcreteClass"})
-    @GridifySetToSet(gridName = "GridifySetToSetTarget")
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget")
     public Collection<Long> findPrimesInArrayListWithoutSplitSizeAndThreshold(ArrayList<Long> input);
 
     /**
@@ -80,7 +80,7 @@ public interface GridifySetToSetTargetInterface {
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     public Long[] findPrimesInArray(Long[] input);
 
     /**
@@ -89,7 +89,7 @@ public interface GridifySetToSetTargetInterface {
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     public long[] findPrimesInPrimitiveArray(long[] input);
 
     /**
@@ -98,7 +98,7 @@ public interface GridifySetToSetTargetInterface {
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     public Iterator<Long> findPrimesWithIterator(Iterator<Long> input);
 
     /**
@@ -107,6 +107,6 @@ public interface GridifySetToSetTargetInterface {
      * @param input Input collection.
      * @return Prime numbers.
      */
-    @GridifySetToSet(gridName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
+    @GridifySetToSet(igniteInstanceName = "GridifySetToSetTarget", threshold = 2, splitSize = 2)
     public Enumeration<Long> findPrimesWithEnumeration(Enumeration<Long> input);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
index 16138f2..6ab1bd0 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTarget.java
@@ -36,7 +36,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     @Override public Long findMaximum(Collection<Long> input) {
         return findMaximum0(input);
     }
@@ -47,7 +47,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget")
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget")
     @Override public Long findMaximumInList(List<Long> input) {
         return findMaximum0(input);
     }
@@ -58,7 +58,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2)
     @Override public Long findMaximumWithoutSplitSize(Collection<Long> input) {
         return findMaximum0(input);
     }
@@ -69,7 +69,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget")
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget")
     @Override public Long findMaximumWithoutSplitSizeAndThreshold(Collection<Long> input) {
         return findMaximum0(input);
     }
@@ -80,7 +80,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     @Override public Long findPrimesInArray(Long[] input) {
         return findMaximumInArray0(input);
     }
@@ -91,7 +91,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     @Override public long findMaximumInPrimitiveArray(long[] input) {
         return findMaximumInPrimitiveArray0(input);
     }
@@ -153,7 +153,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     @Override public long findMaximumInIterator(Iterator<Long> input) {
         assert input != null;
         assert input.hasNext();
@@ -180,7 +180,7 @@ public class GridifySetToValueTarget implements GridifySetToValueTargetInterface
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     @Override public long findMaximumInEnumeration(Enumeration<Long> input) {
         assert input != null;
         assert input.hasMoreElements();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java
index 9d22104..6c3a209 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToValueTargetInterface.java
@@ -33,7 +33,7 @@ public interface GridifySetToValueTargetInterface {
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     public Long findMaximum(Collection<Long> input);
 
     /**
@@ -42,7 +42,7 @@ public interface GridifySetToValueTargetInterface {
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget")
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget")
     public Long findMaximumInList(List<Long> input);
 
     /**
@@ -51,7 +51,7 @@ public interface GridifySetToValueTargetInterface {
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2)
     public Long findMaximumWithoutSplitSize(Collection<Long> input);
 
     /**
@@ -60,7 +60,7 @@ public interface GridifySetToValueTargetInterface {
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget")
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget")
     public Long findMaximumWithoutSplitSizeAndThreshold(Collection<Long> input);
 
     /**
@@ -69,7 +69,7 @@ public interface GridifySetToValueTargetInterface {
      * @param input Input array.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     public Long findPrimesInArray(Long[] input);
 
     /**
@@ -78,7 +78,7 @@ public interface GridifySetToValueTargetInterface {
      * @param input Input array.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     public long findMaximumInPrimitiveArray(long[] input);
 
     /**
@@ -87,7 +87,7 @@ public interface GridifySetToValueTargetInterface {
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     public long findMaximumInIterator(Iterator<Long> input);
 
 
@@ -97,6 +97,6 @@ public interface GridifySetToValueTargetInterface {
      * @param input Input collection.
      * @return Maximum value.
      */
-    @GridifySetToValue(gridName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
+    @GridifySetToValue(igniteInstanceName = "GridifySetToValueTarget", threshold = 2, splitSize = 2)
     public long findMaximumInEnumeration(Enumeration<Long> input);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
index faadb53..d0a3665 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
@@ -51,7 +51,7 @@ public class NonSpringAopSelfTest extends AbstractAopTest {
     }
 
     /** {@inheritDoc} */
-    @Override public String getTestGridName() {
+    @Override public String getTestIgniteInstanceName() {
         return "TestAopTarget";
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
index 9a4d969..a3ecc6a 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/SpringAopSelfTest.java
@@ -31,7 +31,7 @@ public class SpringAopSelfTest extends AbstractAopTest {
     }
 
     /** {@inheritDoc} */
-    @Override public String getTestGridName() {
+    @Override public String getTestIgniteInstanceName() {
         return "TestAopTargetInterface";
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
index c58d9f5..184a80f 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTarget.java
@@ -30,7 +30,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(gridName="TestAopTarget")
+    @Gridify(igniteInstanceName="TestAopTarget")
     @Override public int gridifyDefault(String arg) {
         return Integer.parseInt(arg);
     }
@@ -39,7 +39,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(gridName="TestAopTarget", taskClass = TestGridifyTask.class)
+    @Gridify(igniteInstanceName="TestAopTarget", taskClass = TestGridifyTask.class)
     @Override public int gridifyNonDefaultClass(String arg) {
         return Integer.parseInt(arg);
     }
@@ -49,7 +49,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(gridName="TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName="TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
     @Override public int gridifyNonDefaultName(String arg) {
         return Integer.parseInt(arg);
     }
@@ -58,7 +58,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(gridName="TestAopTarget", taskName = "")
+    @Gridify(igniteInstanceName="TestAopTarget", taskName = "")
     @Override public int gridifyNoName(String arg) {
         return 0;
     }
@@ -68,7 +68,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(gridName="TestAopTarget")
+    @Gridify(igniteInstanceName="TestAopTarget")
     @Override public int gridifyDefaultException(String arg) throws TestGridifyException {
         throw new TestGridifyException(arg);
     }
@@ -78,7 +78,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(gridName="TestAopTarget")
+    @Gridify(igniteInstanceName="TestAopTarget")
     @Override public int gridifyDefaultResource(String arg) throws TestGridifyException {
         int res = Integer.parseInt(arg);
 
@@ -95,7 +95,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(gridName="TestAopTarget", taskClass = TestGridifyTask.class)
+    @Gridify(igniteInstanceName="TestAopTarget", taskClass = TestGridifyTask.class)
     @Override public int gridifyNonDefaultClassResource(String arg) throws TestGridifyException {
         assert getResource() != null;
 
@@ -108,7 +108,7 @@ public class TestAopTarget implements TestAopTargetInterface {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(gridName="TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName="TestAopTarget", taskName = TestGridifyTask.TASK_NAME)
     @Override public int gridifyNonDefaultNameResource(String arg) throws TestGridifyException {
         assert getResource() != null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
index d32c1bf..b42151b 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/TestAopTargetInterface.java
@@ -28,28 +28,28 @@ public interface TestAopTargetInterface extends Serializable {
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(gridName="TestAopTargetInterface")
+    @Gridify(igniteInstanceName="TestAopTargetInterface")
     public int gridifyDefault(String arg);
 
     /**
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(gridName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
     public int gridifyNonDefaultName(String arg);
 
     /**
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(gridName="TestAopTargetInterface", taskClass = TestGridifyTask.class)
+    @Gridify(igniteInstanceName="TestAopTargetInterface", taskClass = TestGridifyTask.class)
     public int gridifyNonDefaultClass(String arg);
 
     /**
      * @param arg Argument.
      * @return Result.
      */
-    @Gridify(gridName="TestAopTargetInterface", taskName = "")
+    @Gridify(igniteInstanceName="TestAopTargetInterface", taskName = "")
     public int gridifyNoName(String arg);
 
     /**
@@ -57,7 +57,7 @@ public interface TestAopTargetInterface extends Serializable {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(gridName="TestAopTargetInterface")
+    @Gridify(igniteInstanceName="TestAopTargetInterface")
     public int gridifyDefaultException(String arg) throws TestGridifyException;
 
     /**
@@ -65,7 +65,7 @@ public interface TestAopTargetInterface extends Serializable {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(gridName="TestAopTargetInterface")
+    @Gridify(igniteInstanceName="TestAopTargetInterface")
     public int gridifyDefaultResource(String arg) throws TestGridifyException;
 
     /**
@@ -73,7 +73,7 @@ public interface TestAopTargetInterface extends Serializable {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(gridName="TestAopTargetInterface", taskClass = TestGridifyTask.class)
+    @Gridify(igniteInstanceName="TestAopTargetInterface", taskClass = TestGridifyTask.class)
     public int gridifyNonDefaultClassResource(String arg) throws TestGridifyException;
 
     /**
@@ -81,6 +81,6 @@ public interface TestAopTargetInterface extends Serializable {
      * @return Result.
      * @throws TestGridifyException If failed.
      */
-    @Gridify(gridName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName="TestAopTargetInterface", taskName = TestGridifyTask.TASK_NAME)
     public int gridifyNonDefaultNameResource(String arg) throws TestGridifyException;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java
index a33482e..3dc8d53 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/GridifyHierarchyTest.java
@@ -45,7 +45,7 @@ public class GridifyHierarchyTest extends GridCommonAbstractTest {
     }
 
    /** {@inheritDoc} */
-    @Override public String getTestGridName() {
+    @Override public String getTestIgniteInstanceName() {
         return "GridifyHierarchyTest";
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java
index f2e2663..1ad6c73 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/hierarchy/SuperTarget.java
@@ -26,7 +26,7 @@ public abstract class SuperTarget {
     /**
      * @return Always returns "SuperTarget.methodA()".
      */
-    @Gridify(gridName = "GridifyHierarchyTest")
+    @Gridify(igniteInstanceName = "GridifyHierarchyTest")
     protected String methodA() {
         System.out.println(">>> Called SuperTarget.methodA()");
 
@@ -43,7 +43,7 @@ public abstract class SuperTarget {
     /**
      * @return "SuperTarget.methodC()" string.
      */
-    @Gridify(gridName = "GridifyHierarchyTest")
+    @Gridify(igniteInstanceName = "GridifyHierarchyTest")
     private String methodC() {
         System.out.println(">>> Called SuperTarget.methodC()");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
index 3a22dde..7511d61 100644
--- a/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/p2p/P2PGridifySelfTest.java
@@ -39,8 +39,8 @@ public class P2PGridifySelfTest extends GridCommonAbstractTest {
     private DeploymentMode depMode;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         // Override P2P configuration to exclude Task and Job classes
         cfg.setPeerClassLoadingLocalClassPathExclude(GridP2PTestTask.class.getName(), GridP2PTestJob.class.getName());
@@ -93,7 +93,7 @@ public class P2PGridifySelfTest extends GridCommonAbstractTest {
      * @return The same value as parameter has.
      */
     @Gridify(taskName = "org.apache.ignite.p2p.GridP2PTestTask",
-        gridName="org.apache.ignite.p2p.GridP2PGridifySelfTest1")
+        igniteInstanceName="org.apache.ignite.p2p.GridP2PGridifySelfTest1")
     public int executeGridify(int res) {
         return res;
     }
@@ -129,7 +129,7 @@ public class P2PGridifySelfTest extends GridCommonAbstractTest {
      * @param res Result.
      * @return The same value as parameter has.
      */
-    @Gridify(gridName="org.apache.ignite.p2p.GridP2PGridifySelfTest1")
+    @Gridify(igniteInstanceName="org.apache.ignite.p2p.GridP2PGridifySelfTest1")
     public Integer executeGridifyResource(int res) {
         String path = "org/apache/ignite/p2p/p2p.properties";
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
index dc9760d..402bdf4 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java
@@ -83,7 +83,7 @@ public class SingleSplitsLoadTest extends GridCommonAbstractTest {
      * @throws Exception If task execution failed.
      */
     public void testLoad() throws Exception {
-        final Ignite ignite = G.ignite(getTestGridName());
+        final Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
         final long end = getTestDurationInMinutes() * 60 * 1000 + System.currentTimeMillis();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
index 317a43d..096068f 100644
--- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
+++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
@@ -46,8 +46,8 @@ public class GridifySingleSplitLoadTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @SuppressWarnings("ConstantConditions")
-    @Override public String getTestGridName() {
-        // Gridify task has empty grid name by default so we need to change it
+    @Override public String getTestIgniteInstanceName() {
+        // Gridify task has empty Ignite instance name by default so we need to change it
         // here.
         return null;
     }
@@ -101,7 +101,7 @@ public class GridifySingleSplitLoadTest extends GridCommonAbstractTest {
      */
     @SuppressWarnings("unchecked")
     public void testGridifyLoad() throws Exception {
-        Ignite ignite = G.ignite(getTestGridName());
+        Ignite ignite = G.ignite(getTestIgniteInstanceName());
 
         ignite.compute().localDeployTask(GridifyLoadTestTask.class, GridifyLoadTestTask.class.getClassLoader());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java b/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
index b3d17a5..15049c2 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalAopTarget.java
@@ -30,7 +30,7 @@ public class ExternalAopTarget {
      * @param arg Argument.
      * @return Argument parsed to integer.
      */
-    @Gridify(gridName="ExternalAopTarget")
+    @Gridify(igniteInstanceName="ExternalAopTarget")
     public int gridifyDefault(String arg) {
         return Integer.parseInt(arg);
     }
@@ -39,7 +39,7 @@ public class ExternalAopTarget {
      * @param arg Argument.
      * @return Argument parsed to integer.
      */
-    @Gridify(gridName="ExternalAopTarget", taskClass = ExternalGridifyTask.class)
+    @Gridify(igniteInstanceName="ExternalAopTarget", taskClass = ExternalGridifyTask.class)
     public int gridifyNonDefaultClass(String arg) {
         return Integer.parseInt(arg);
     }
@@ -49,7 +49,7 @@ public class ExternalAopTarget {
      * @param arg Argument.
      * @return Argument parsed to integer.
      */
-    @Gridify(gridName="ExternalAopTarget", taskName = ExternalGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName="ExternalAopTarget", taskName = ExternalGridifyTask.TASK_NAME)
     public int gridifyNonDefaultName(String arg) {
         return Integer.parseInt(arg);
     }
@@ -58,7 +58,7 @@ public class ExternalAopTarget {
      * @param arg Argument.
      * @return ALways 0.
      */
-    @Gridify(gridName="ExternalAopTarget", taskName = "myTask", taskClass = ExternalGridifyTask.class)
+    @Gridify(igniteInstanceName="ExternalAopTarget", taskName = "myTask", taskClass = ExternalGridifyTask.class)
     public int gridifyTaskClassAndTaskName(String arg) {
         assert arg != null;
 
@@ -70,7 +70,7 @@ public class ExternalAopTarget {
      * @return No-op.
      * @throws ExternalGridifyException Always.
      */
-    @Gridify(gridName="ExternalAopTarget")
+    @Gridify(igniteInstanceName="ExternalAopTarget")
     public int gridifyDefaultException(String arg) throws ExternalGridifyException {
         throw new ExternalGridifyException(arg);
     }
@@ -80,7 +80,7 @@ public class ExternalAopTarget {
      * @return Argument parsed to integer.
      * @throws ExternalGridifyException If failed.
      */
-    @Gridify(gridName="ExternalAopTarget")
+    @Gridify(igniteInstanceName="ExternalAopTarget")
     public int gridifyDefaultResource(String arg) throws ExternalGridifyException {
         getResource();
 
@@ -92,7 +92,7 @@ public class ExternalAopTarget {
      * @return Argument parsed to integer.
      * @throws ExternalGridifyException If failed.
      */
-    @Gridify(gridName="ExternalAopTarget", taskClass = ExternalGridifyTask.class)
+    @Gridify(igniteInstanceName="ExternalAopTarget", taskClass = ExternalGridifyTask.class)
     public int gridifyNonDefaultClassResource(String arg) throws ExternalGridifyException {
         getResource();
 
@@ -105,7 +105,7 @@ public class ExternalAopTarget {
      * @return Argument parsed to integer.
      * @throws ExternalGridifyException If failed.
      */
-    @Gridify(gridName="ExternalAopTarget", taskName = ExternalGridifyTask.TASK_NAME)
+    @Gridify(igniteInstanceName="ExternalAopTarget", taskName = ExternalGridifyTask.TASK_NAME)
     public int gridifyNonDefaultNameResource(String arg) throws ExternalGridifyException {
         getResource();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
index 998ddac..b53501b 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
@@ -72,7 +72,7 @@ public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void deployTask() throws Exception {
-        G.ignite(getTestGridName()).compute().localDeployTask(TestGridifyTask.class,
+        G.ignite(getTestIgniteInstanceName()).compute().localDeployTask(TestGridifyTask.class,
             TestGridifyTask.class.getClassLoader());
     }
 
@@ -534,9 +534,9 @@ public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * @return Test grid name.
+     * @return Test Ignite instance name.
      */
-    @Override public String getTestGridName() {
+    @Override public String getTestIgniteInstanceName() {
         return "ExternalAopTarget";
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index 292066b..3d5954f 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -263,7 +263,7 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi,
 
     /** {@inheritDoc} */
     @SuppressWarnings({"BusyWait"})
-    @Override public void spiStart(String gridName) throws IgniteSpiException {
+    @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
         // Start SPI start stopwatch.
         startStopwatch();
 
@@ -351,7 +351,7 @@ public class S3CheckpointSpi extends IgniteSpiAdapter implements CheckpointSpi,
 
         timeoutWrk.start();
 
-        registerMBean(gridName, this, S3CheckpointSpiMBean.class);
+        registerMBean(igniteInstanceName, this, S3CheckpointSpiMBean.class);
 
         // Ack ok start.
         if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
index a90323e..529e4d0 100644
--- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
+++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
@@ -29,10 +29,10 @@ import org.apache.ignite.testsuites.IgniteS3TestSuite;
  */
 public class S3CheckpointManagerSelfTest extends GridCheckpointManagerAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        assertTrue("Unexpected grid name: " + gridName, gridName.contains("s3"));
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        assertTrue("Unexpected Ignite instance name: " + igniteInstanceName, igniteInstanceName.contains("s3"));
 
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         S3CheckpointSpi spi = new S3CheckpointSpi();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java
index 709ab77..3d50b12 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/cache/JmhCacheAbstractBenchmark.java
@@ -132,13 +132,13 @@ public class JmhCacheAbstractBenchmark extends JmhAbstractBenchmark {
     /**
      * Create Ignite configuration.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return Configuration.
      */
-    protected IgniteConfiguration configuration(String gridName) {
+    protected IgniteConfiguration configuration(String igniteInstanceName) {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setGridName(gridName);
+        cfg.setIgniteInstanceName(igniteInstanceName);
 
         cfg.setLocalHost("127.0.0.1");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
index dea326c..102db57 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
@@ -71,8 +71,8 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest {
     private static GridClient client;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setConnectorConfiguration(new ConnectorConfiguration());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index 9f6bf2b..027574b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -154,8 +154,8 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
         c.setLocalHost(HOST);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
index 09f99fd..eae4b0e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
@@ -95,8 +95,8 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         assert cfg.getConnectorConfiguration() == null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
index 4d0a355..48275e7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStartNodeTask.java
@@ -78,11 +78,11 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ
 
         IgniteConfiguration cfg = getConfig(type);
 
-        // Generate unique for this VM grid name.
-        String gridName = cfg.getGridName() + " (" + UUID.randomUUID() + ")";
+        // Generate unique for this VM Ignite instance name.
+        String igniteInstanceName = cfg.getIgniteInstanceName() + " (" + UUID.randomUUID() + ")";
 
-        // Update grid name (required to be unique).
-        cfg.setGridName(gridName);
+        // Update Ignite instance name (required to be unique).
+        cfg.setIgniteInstanceName(igniteInstanceName);
 
         // Start new node in current VM.
         Ignite g =  G.start(cfg);
@@ -178,11 +178,11 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ
         // Wait for node stops.
         //U.sleep(1000);
 
-        Collection<String> gridNames = new ArrayList<>();
+        Collection<String> igniteInstanceNames = new ArrayList<>();
 
         for (Ignite g : G.allGrids())
-            gridNames.add(g.name());
+            igniteInstanceNames.add(g.name());
 
-        parent.log().info(">>> Available grids: " + gridNames);
+        parent.log().info(">>> Available Ignite instances: " + igniteInstanceNames);
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
index b648a43..d654f39 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientStopNodeTask.java
@@ -106,7 +106,7 @@ public class ClientStopNodeTask extends ComputeTaskSplitAdapter<String, Integer>
         @Override public Object execute() {
             log.info(">>> Stop node [nodeId=" + ignite.cluster().localNode().id() + ", name='" + ignite.name() + "']");
 
-            String prefix = ClientStartNodeTask.getConfig(gridType).getGridName() + " (";
+            String prefix = ClientStartNodeTask.getConfig(gridType).getIgniteInstanceName() + " (";
 
             if (!ignite.name().startsWith(prefix)) {
                 int stoppedCnt = 0;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
index 9dc5042..9225262 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
@@ -62,8 +62,8 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
         c.setLocalHost(getTestResources().getLocalHost());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
index 62d8f63..4b63fff 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
@@ -30,8 +30,8 @@ public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridComm
     private static final int PORT = 11211;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg =  super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg =  super.getConfiguration(igniteInstanceName);
 
         cfg.setLocalHost("127.0.0.1");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java
index bda1bef..4f9326c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTestRestServer.java
@@ -127,7 +127,7 @@ public class ClientTestRestServer {
      */
     public void start() throws IgniteCheckedException {
         try {
-            String gridName = "test";
+            String igniteInstanceName = "test";
 
             srv = GridNioServer.<GridClientMessage>builder()
                 .address(InetAddress.getByName("127.0.0.1"))
@@ -135,12 +135,12 @@ public class ClientTestRestServer {
                 .listener(new TestListener())
                 .logger(log)
                 .selectorCount(2)
-                .gridName(gridName)
+                .igniteInstanceName(igniteInstanceName)
                 .byteOrder(ByteOrder.nativeOrder())
                 .tcpNoDelay(true)
                 .directBuffer(false)
                 .filters(
-                    new GridNioAsyncNotifyFilter(gridName, Executors.newFixedThreadPool(2), log),
+                    new GridNioAsyncNotifyFilter(igniteInstanceName, Executors.newFixedThreadPool(2), log),
                     new GridNioCodecFilter(new TestParser(), log, false)
                 )
                 .build();

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index 893732d..7fb2385 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -154,8 +154,8 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
         c.setLocalHost(HOST);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index 2577ae4..685d918 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -219,8 +219,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setLocalHost(HOST);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
index 68816d1..f8bcd8a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
@@ -68,8 +68,8 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration c = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
         TcpDiscoverySpi disco = new TcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
index ba52366..971dcb1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
@@ -77,8 +77,8 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         assert cfg.getConnectorConfiguration() == null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java
index 2e9e62a..5df424c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java
@@ -41,7 +41,7 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest {
     private static final int GRID_HTTP_PORT = 11087;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
 
         discoSpi.setIpFinder(IP_FINDER);
@@ -49,7 +49,7 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
         cfg.setDiscoverySpi(discoSpi);
-        cfg.setGridName(gridName);
+        cfg.setIgniteInstanceName(igniteInstanceName);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
index 332bbba..afaadd1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
@@ -58,17 +58,17 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac
     protected Connection conn;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        return getConfiguration0(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        return getConfiguration0(igniteInstanceName);
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return Grid configuration used for starting the grid.
      * @throws Exception If failed.
      */
-    private IgniteConfiguration getConfiguration0(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    private IgniteConfiguration getConfiguration0(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration<?,?> cache = defaultCacheConfiguration();
 
@@ -93,12 +93,12 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac
     }
 
     /**
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return Grid configuration used for starting the grid ready for manipulating binary objects.
      * @throws Exception If failed.
      */
-    IgniteConfiguration getBinaryConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = getConfiguration0(gridName);
+    IgniteConfiguration getBinaryConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = getConfiguration0(igniteInstanceName);
 
         cfg.setMarshaller(new BinaryMarshaller());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java
index 18410a8..e8a09d9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerInsertStatementSelfTest.java
@@ -29,7 +29,7 @@ public class JdbcBinaryMarshallerInsertStatementSelfTest extends JdbcInsertState
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        return getBinaryConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        return getBinaryConfiguration(igniteInstanceName);
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java
index c467b82..5e4b559 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBinaryMarshallerMergeStatementSelfTest.java
@@ -29,7 +29,7 @@ public class JdbcBinaryMarshallerMergeStatementSelfTest extends JdbcMergeStateme
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        return getBinaryConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        return getBinaryConfiguration(igniteInstanceName);
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
index d126d34..35321b2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
@@ -49,8 +49,8 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
     private Statement stmt;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration<?,?> cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
index 8c05df3..6c44076 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
@@ -57,8 +57,8 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
     private boolean client;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration(CUSTOM_CACHE_NAME));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
index 53bfa73..c71ca94 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
@@ -51,8 +51,8 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest {
     private Statement stmt;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration<?,?> cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
index adf1368..6d5181b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
@@ -47,8 +47,8 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest {
     private Statement stmt;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
index a8988f9..3689c07 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
@@ -47,8 +47,8 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
index d750376..fb22203 100755
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
@@ -56,8 +56,8 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
     private static final String BASE_URL = CFG_URL_PREFIX + "modules/clients/src/test/config/jdbc-config.xml";
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration<?,?> cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
index cdcda48..4bb2fe8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
@@ -53,8 +53,8 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest {
     private static final int GRID_CNT = 2;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setCacheConfiguration(cacheConfiguration(CACHE1_NAME), cacheConfiguration(CACHE2_NAME));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
index ea586b2..1e44f58 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
@@ -53,8 +53,8 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
     private PreparedStatement stmt;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration<?,?> cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
index 1b5223e..64a077e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
@@ -68,8 +68,8 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
     private Statement stmt;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration<?,?> cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
index 7898bc8..7826987 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
@@ -57,8 +57,8 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
     private Statement stmt;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration<?,?> cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
index 9a030a7..5baac62 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
@@ -64,8 +64,8 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setLocalHost(LOC_HOST);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
index c03c06e..f80b5e9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java
@@ -78,8 +78,8 @@ public class ClientMemcachedProtocolSelfTest extends AbstractRestProcessorSelfTe
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         assert cfg.getConnectorConfiguration() != null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 84071ea..5e3d896 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -494,7 +494,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
 
         info("Name command result: " + ret);
 
-        assertEquals(getTestGridName(0), jsonResponse(ret).asText());
+        assertEquals(getTestIgniteInstanceName(0), jsonResponse(ret).asText());
     }
 
     /**
@@ -2271,8 +2271,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         FileSystemConfiguration igfs = new FileSystemConfiguration();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java
index ad00f52..0073471 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java
@@ -34,8 +34,8 @@ public class JettyRestProcessorSignedSelfTest extends JettyRestProcessorAbstract
     protected static final String REST_SECRET_KEY = "secret-key";
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         assert cfg.getConnectorConfiguration() != null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index 251e184..b6781d9 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -93,8 +93,8 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setLocalHost(HOST);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
index 2797387..87540c2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
@@ -76,8 +76,8 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setLocalHost(HOST);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
index 5b88079..24274d7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java
@@ -34,8 +34,8 @@ public class RestProcessorMultiStartSelfTest extends GridCommonAbstractTest {
     private static boolean client = false;
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setConnectorConfiguration(new ConnectorConfiguration());
         cfg.setClientMode(client);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
index ad62f95..477c41a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
@@ -56,8 +56,8 @@ public class RestProcessorStartSelfTest extends GridCommonAbstractTest {
     private CountDownLatch proceed;
 
     /** {@inheritDoc}*/
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setLocalHost(HOST);
 
@@ -152,7 +152,7 @@ public class RestProcessorStartSelfTest extends GridCommonAbstractTest {
      */
     private class TestDiscoverySpi extends TcpDiscoverySpi {
         /** {@inheritDoc} */
-        @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
+        @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException {
             gridReady.countDown();
 
             try {
@@ -162,7 +162,7 @@ public class RestProcessorStartSelfTest extends GridCommonAbstractTest {
                 throw new IgniteSpiException("Failed to await start signal.", e);
             }
 
-            super.spiStart(gridName);
+            super.spiStart(igniteInstanceName);
         }
     }
 }
\ No newline at end of file


Mime
View raw message