diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java index d5f8cc09308af..01be0bc7e0552 100644 --- a/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java @@ -27,20 +27,20 @@ public class CacheClientBinaryExampleTest extends GridAbstractExamplesTest { /** {@inheritDoc} */ @Override protected String defaultConfig() { - return "examples/config/portable/example-ignite-portable.xml"; + return "examples/config/binary/example-ignite-binary.xml"; } /** * @throws Exception If failed. */ - public void testPortablePutGetExample() throws Exception { + public void testBinaryPutGetExample() throws Exception { CacheClientBinaryPutGetExample.main(new String[] {}); } /** * @throws Exception If failed. */ - public void testPortableQueryExample() throws Exception { + public void testBinaryQueryExample() throws Exception { CacheClientBinaryQueryExample.main(new String[] {}); } } diff --git a/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java b/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java index bdba7c3196d8d..5dcad62d2ddb8 100644 --- a/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java @@ -25,13 +25,13 @@ public class ComputeClientBinaryExampleTest extends GridAbstractExamplesTest { /** {@inheritDoc} */ @Override protected String defaultConfig() { - return "examples/config/portable/example-ignite-portable.xml"; + return "examples/config/binary/example-ignite-binary.xml"; } /** * @throws Exception If failed. */ - public void testPortableTaskExecutionExample() throws Exception { + public void testBinaryTaskExecutionExample() throws Exception { ComputeClientBinaryTaskExecutionExample.main(new String[] {}); } } diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java index 54fa8a3717c77..fcf9be90e2715 100644 --- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java +++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java @@ -88,7 +88,7 @@ public static TestSuite suite() throws Exception { suite.addTest(new TestSuite(MemcacheRestExamplesMultiNodeSelfTest.class)); suite.addTest(new TestSuite(MonteCarloExamplesMultiNodeSelfTest.class)); - // Portable. + // Binary. suite.addTest(new TestSuite(CacheClientBinaryExampleTest.class)); suite.addTest(new TestSuite(ComputeClientBinaryExampleTest.class)); diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java index bd7ca717163b0..22e9a2545fa91 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler; import org.apache.ignite.internal.util.typedef.F; -import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES; +import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_BINARIES; /** * Tests conversions between GridClientCacheFlag. @@ -37,7 +37,7 @@ public class ClientCacheFlagsCodecTest extends TestCase { */ public void testEncodingDecodingFullness() { for (GridClientCacheFlag f : GridClientCacheFlag.values()) { - if (f == KEEP_PORTABLES) + if (f == KEEP_BINARIES) continue; int bits = GridClientConnection.encodeCacheFlags(Collections.singleton(f)); @@ -71,8 +71,8 @@ private void doTestGroup(GridClientCacheFlag... flags) { boolean out = GridCacheCommandHandler.parseCacheFlags(bits); - int length = flagSet.contains(KEEP_PORTABLES) ? flagSet.size() - 1 : flagSet.size(); + int length = flagSet.contains(KEEP_BINARIES) ? flagSet.size() - 1 : flagSet.size(); assertEquals(length > 0, out); } -} \ No newline at end of file +} diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index 176f0d5adc536..f52640b46033f 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -123,12 +123,12 @@ - + - + @@ -146,7 +146,7 @@ - + @@ -159,7 +159,7 @@ - + diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index ceaab53f0d23b..073ac6562887d 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -125,12 +125,12 @@ - + - + @@ -148,7 +148,7 @@ - + @@ -161,7 +161,7 @@ - + diff --git a/modules/core/pom.xml b/modules/core/pom.xml index e4e975e5bb98c..065082dcc1e6b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -36,8 +36,8 @@ - ignite-portables-test-repo - file://${basedir}/src/test/portables/repo + ignite-binaries-test-repo + file://${basedir}/src/test/binaries/repo diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java index 2f68e7a87db09..450cf7088555e 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java @@ -32,11 +32,11 @@ import org.jetbrains.annotations.Nullable; /** - * Defines portable objects functionality. With portable objects you are able to: + * Defines binary objects functionality. With binary objects you are able to: *
    *
  • Seamlessly interoperate between Java, .NET, and C++.
    • - *
  • Make any object portable with zero code change to your existing code.
    • - *
  • Nest portable objects within each other.
    • + *
  • Make any object binary with zero code change to your existing code.
    • + *
  • Nest binary objects within each other.
    • *
  • Automatically handle {@code circular} or {@code null} references.
    • *
  • Automatically convert collections and maps between Java, .NET, and C++.
    • *
  • @@ -45,24 +45,24 @@ *
    • *
  • Avoid need to have concrete class definitions on the server side.
    • *
  • Dynamically change structure of the classes without having to restart the cluster.
    • - *
  • Index into portable objects for querying purposes.
    • + *
  • Index into binary objects for querying purposes.
    • *
- *

Working With Portables Directly

- * Once an object is defined as portable, - * Ignite will always store it in memory in the portable (i.e. binary) format. - * User can choose to work either with the portable format or with the deserialized form + *

Working With Binaries Directly

+ * Once an object is defined as binary, + * Ignite will always store it in memory in the binary (i.e. binary) format. + * User can choose to work either with the binary format or with the deserialized form * (assuming that class definitions are present in the classpath). *

- * To work with the portable format directly, user should create a special cache projection + * To work with the binary format directly, user should create a special cache projection * using IgniteCache.withKeepBinary() method and then retrieve individual fields as needed: * 

- * IgniteCache<PortableObject, PortableObject> prj = cache.withKeepBinary();
+ * IgniteCache<BinaryObject, BinaryObject> prj = cache.withKeepBinary();
  *
- * // Convert instance of MyKey to portable format.
- * // We could also use PortableBuilder to create the key in portable format directly.
- * PortableObject key = grid.binary().toBinary(new MyKey());
+ * // Convert instance of MyKey to binary format.
+ * // We could also use BinaryBuilder to create the key in binary format directly.
+ * BinaryObject key = grid.binary().toBinary(new MyKey());
  *
- * PortableObject val = prj.get(key);
+ * BinaryObject val = prj.get(key);
  *
  * String field = val.field("myFieldName");
  *
@@ -76,14 +76,14 @@ * // Normal java getter. * String fieldVal = val.getMyFieldName(); * - * If we used, for example, one of the automatically handled portable types for a key, like integer, - * and still wanted to work with binary portable format for values, then we would declare cache projection + * If we used, for example, one of the automatically handled binary types for a key, like integer, + * and still wanted to work with binary binary format for values, then we would declare cache projection * as follows: * 
- * IgniteCache<Integer.class, PortableObject> prj = cache.withKeepBinary();
+ * IgniteCache<Integer.class, BinaryObject> prj = cache.withKeepBinary();
  *
- *

Automatic Portable Types

- * Note that only portable classes are converted to {@link org.apache.ignite.binary.BinaryObject} format. Following + *

Automatic Binary Types

+ * Note that only binary classes are converted to {@link org.apache.ignite.binary.BinaryObject} format. Following * classes are never converted (e.g., {@link #toBinary(Object)} method will return original * object, and instances of these classes will be stored in cache without changes): *
    @@ -96,74 +96,74 @@ *
  • Enums and array of enums
    • *
  • * Maps, collections and array of objects (but objects inside - * them will still be converted if they are portable) + * them will still be converted if they are binary) *
    • *
*

Working With Maps and Collections

- * All maps and collections in the portable objects are serialized automatically. When working + * All maps and collections in the binary objects are serialized automatically. When working * with different platforms, e.g. C++ or .NET, Ignite will automatically pick the most * adequate collection or map in either language. For example, {@link ArrayList} in Java will become * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap} * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary} * in C#, etc. - *

Building Portable Objects

- * Ignite comes with {@link org.apache.ignite.binary.BinaryObjectBuilder} which allows to build portable objects dynamically: + *

Building Binary Objects

+ * Ignite comes with {@link org.apache.ignite.binary.BinaryObjectBuilder} which allows to build binary objects dynamically: * 
- * PortableBuilder builder = Ignition.ignite().binary().builder();
+ * BinaryBuilder builder = Ignition.ignite().binary().builder();
  *
  * builder.typeId("MyObject");
  *
  * builder.stringField("fieldA", "A");
  * build.intField("fieldB", "B");
  *
- * PortableObject portableObj = builder.build();
+ * BinaryObject binaryObj = builder.build();
  *
* For the cases when class definition is present * in the class path, it is also possible to populate a standard POJO and then - * convert it to portable format, like so: + * convert it to binary format, like so: * 
  * MyObject obj = new MyObject();
  *
  * obj.setFieldA("A");
  * obj.setFieldB(123);
  *
- * PortableObject portableObj = Ignition.ignite().binary().toBinary(obj);
+ * BinaryObject binaryObj = Ignition.ignite().binary().toBinary(obj);
  *
- * NOTE: you don't need to convert typed objects to portable format before storing + * NOTE: you don't need to convert typed objects to binary format before storing * them in cache, Ignite will do that automatically. - *

Portable Metadata

- * Even though Ignite portable protocol only works with hash codes for type and field names - * to achieve better performance, Ignite provides metadata for all portable types which + *

Binary Metadata

+ * Even though Ignite binary protocol only works with hash codes for type and field names + * to achieve better performance, Ignite provides metadata for all binary types which * can be queried ar runtime via any of the {@link IgniteBinary#type(Class)} - * methods. Having metadata also allows for proper formatting of {@code PortableObject#toString()} method, - * even when portable objects are kept in binary format only, which may be necessary for audit reasons. + * methods. Having metadata also allows for proper formatting of {@code BinaryObject#toString()} method, + * even when binary objects are kept in binary format only, which may be necessary for audit reasons. *

Dynamic Structure Changes

- * Since objects are always cached in the portable binary format, server does not need to + * Since objects are always cached in the binary binary format, server does not need to * be aware of the class definitions. Moreover, if class definitions are not present or not - * used on the server, then clients can continuously change the structure of the portable + * used on the server, then clients can continuously change the structure of the binary * objects without having to restart the cluster. For example, if one client stores a * certain class with fields A and B, and another client stores the same class with - * fields B and C, then the server-side portable object will have the fields A, B, and C. - * As the structure of a portable object changes, the new fields become available for SQL queries + * fields B and C, then the server-side binary object will have the fields A, B, and C. + * As the structure of a binary object changes, the new fields become available for SQL queries * automatically. *

Configuration

* By default all your objects are considered as binary and no specific configuration is needed. * The only requirement Ignite imposes is that your object has an empty * constructor. Note, that since server side does not have to know the class definition, - * you only need to list portable objects in configuration on the client side. However, if you - * list them on the server side as well, then you get the ability to deserialize portable objects + * you only need to list binary objects in configuration on the client side. However, if you + * list them on the server side as well, then you get the ability to deserialize binary objects * into concrete types on the server as well as on the client. *

- * Here is an example of portable configuration (note that star (*) notation is supported): + * Here is an example of binary configuration (note that star (*) notation is supported): * 

  * ...
- * <!-- Explicit portable objects configuration. -->
+ * <!-- Explicit binary objects configuration. -->
  * <property name="marshaller">
- *     <bean class="org.apache.ignite.marshaller.portable.PortableMarshaller">
+ *     <bean class="org.apache.ignite.marshaller.binary.BinaryMarshaller">
  *         <property name="classNames">
  *             <list>
- *                 <value>my.package.for.portable.objects.*</value>
- *                 <value>org.apache.ignite.examples.client.portable.Employee</value>
+ *                 <value>my.package.for.binary.objects.*</value>
+ *                 <value>org.apache.ignite.examples.client.binary.Employee</value>
  *             </list>
  *         </property>
  *     </bean>
@@ -174,7 +174,7 @@
  * 
  * IgniteConfiguration cfg = new IgniteConfiguration();
  *
- * PortableMarshaller marsh = new PortableMarshaller();
+ * BinaryMarshaller marsh = new BinaryMarshaller();
  *
  * marsh.setClassNames(Arrays.asList(
  *     Employee.class.getName(),
@@ -183,7 +183,7 @@
  *
  * cfg.setMarshaller(marsh);
  * 

- * You can also specify class name for a portable object via {@link org.apache.ignite.binary.BinaryTypeConfiguration}.
+ * You can also specify class name for a binary object via {@link org.apache.ignite.binary.BinaryTypeConfiguration}.
  * Do it in case if you need to override other configuration properties on per-type level, like
  * ID-mapper, or serializer.
  * 
Custom Affinity Keys

@@ -191,15 +191,15 @@
  * storing objects in cache. For example, if you are caching {@code Employee} object with
  * {@code Organization}, and want to colocate employees with organization they work for,
  * so you can process them together, you need to specify an alternate affinity key.
- * With portable objects you would have to do it as following:
+ * With binary objects you would have to do it as following:
  * 
  * <property name="marshaller">
- *     <bean class="org.gridgain.grid.marshaller.portable.PortableMarshaller">
+ *     <bean class="org.gridgain.grid.marshaller.binary.BinaryMarshaller">
  *         ...
  *         <property name="typeConfigurations">
  *             <list>
- *                 <bean class="org.apache.ignite.binary.PortableTypeConfiguration">
- *                     <property name="className" value="org.apache.ignite.examples.client.portable.EmployeeKey"/>
+ *                 <bean class="org.apache.ignite.binary.BinaryTypeConfiguration">
+ *                     <property name="className" value="org.apache.ignite.examples.client.binary.EmployeeKey"/>
  *                     <property name="affinityKeyFieldName" value="organizationId"/>
  *                 </bean>
  *             </list>
@@ -212,19 +212,19 @@
  * Serialization and deserialization works out-of-the-box in Ignite. However, you can provide your own custom
  * serialization logic by optionally implementing {@link org.apache.ignite.binary.Binarylizable} interface, like so:
  * 
- * public class Address implements PortableMarshalAware {
+ * public class Address implements BinaryMarshalAware {
  *     private String street;
  *     private int zip;
  *
- *     // Empty constructor required for portable deserialization.
+ *     // Empty constructor required for binary deserialization.
  *     public Address() {}
  *
- *     @Override public void writeBinary(PortableWriter writer) throws PortableException {
+ *     @Override public void writeBinary(BinaryWriter writer) throws BinaryException {
  *         writer.writeString("street", street);
  *         writer.writeInt("zip", zip);
  *     }
  *
- *     @Override public void readBinary(PortableReader reader) throws PortableException {
+ *     @Override public void readBinary(BinaryReader reader) throws BinaryException {
  *         street = reader.readString("street");
  *         zip = reader.readInt("zip");
  *     }
@@ -255,7 +255,7 @@
  * ID-mapper may be provided either globally in {@link org.apache.ignite.configuration.BinaryConfiguration},
  * or for a specific type via {@link org.apache.ignite.binary.BinaryTypeConfiguration} instance.
  * 
Query Indexing

- * Portable objects can be indexed for querying by specifying index fields in
+ * Binary objects can be indexed for querying by specifying index fields in
  * {@link org.apache.ignite.cache.CacheTypeMetadata} inside of specific
  * {@link org.apache.ignite.configuration.CacheConfiguration} instance,
  * like so:
@@ -273,7 +273,7 @@
  *                     <map>
  *                     <entry key="name" value="java.lang.String"/>
  *
- *                         <!-- Nested portable objects can also be indexed. -->
+ *                         <!-- Nested binary objects can also be indexed. -->
  *                         <entry key="address.zip" value="java.lang.Integer"/>
  *                     </map>
  *                 </property>
@@ -302,20 +302,20 @@ public interface IgniteBinary {
     public  T toBinary(@Nullable Object obj) throws BinaryObjectException;
 
     /**
-     * Creates new portable builder.
+     * Creates new binary builder.
      *
      * @param typeName Type name.
-     * @return Newly portable builder.
+     * @return Newly binary builder.
      */
     public BinaryObjectBuilder builder(String typeName) throws BinaryObjectException;
 
     /**
-     * Creates portable builder initialized by existing portable object.
+     * Creates binary builder initialized by existing binary object.
      *
-     * @param portableObj Portable object to initialize builder.
-     * @return Portable builder.
+     * @param binaryObj Binary object to initialize builder.
+     * @return Binary builder.
      */
-    public BinaryObjectBuilder builder(BinaryObject portableObj) throws BinaryObjectException;
+    public BinaryObjectBuilder builder(BinaryObject binaryObj) throws BinaryObjectException;
 
     /**
      * Gets metadata for provided class.
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 3376abce61ae9..f98d50adb7ac1 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -138,7 +138,7 @@ public interface IgniteCache extends javax.cache.Cache, IgniteAsyncS
      * so keys and values will be returned from cache API methods without changes. Therefore,
      * signature of the cache can contain only following types:
      * 
    
-     *     
  • org.apache.ignite.binary.PortableObject for portable classes
    • 
+     *     
  • org.apache.ignite.binary.BinaryObject for binary classes
    • 
      *     
  • All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)
    • 
      *     
  • Arrays of primitives (byte[], int[], ...)
    • 
      *     
  • {@link String} and array of {@link String}s
    • 
@@ -148,7 +148,7 @@ public interface IgniteCache extends javax.cache.Cache, IgniteAsyncS
      *     
  • Enums and array of enums
    • 
      *     
  • 
      *         Maps, collections and array of objects (but objects inside
-     *         them will still be converted if they are portable)
+     *         them will still be converted if they are binary)
      *     
    • 
      * 

      * 

@@ -158,7 +158,7 @@ public interface IgniteCache extends javax.cache.Cache, IgniteAsyncS
      * 
      * IgniteCache prj = cache.withKeepBinary();
      *
-     * // Value is not deserialized and returned in portable format.
+     * // Value is not deserialized and returned in binary format.
      * BinaryObject po = prj.get(1);
      * 

      * 

@@ -166,7 +166,7 @@ public interface IgniteCache extends javax.cache.Cache, IgniteAsyncS
      * if default marshaller is used.
      * If not, this method is no-op and will return current cache.
      *
-     * @return New cache instance for portable objects.
+     * @return New cache instance for binary objects.
      */
     public  IgniteCache withKeepBinary();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
index be7a156117e8a..93a9469eb1592 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
@@ -25,7 +25,7 @@
 import java.util.UUID;
 
 /**
- * Reader for portable objects used in {@link Binarylizable} implementations.
+ * Reader for binary objects used in {@link Binarylizable} implementations.
  * Useful for the cases when user wants a fine-grained control over serialization.
  * 

  * Note that Ignite never writes full strings for field or type names. Instead,
@@ -286,4 +286,4 @@ public  Collection readCollection(String fieldName, BinaryCollectionFactor
      * @return Raw reader.
      */
     public BinaryRawReader rawReader();
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
index c879da6f11c69..fb5b0399f36a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
@@ -29,8 +29,8 @@
  * will help to map keys to the same nodes whenever possible.
  * 

  * Note that on case clients exist they will query this object from the server and use it for affinity calculation.
- * Therefore you must ensure that server and clients can marshal and unmarshal this object in portable format,
- * i.e. all parties have object class(es) configured as portable.
+ * Therefore you must ensure that server and clients can marshal and unmarshal this object in binary format,
+ * i.e. all parties have object class(es) configured as binary.
  *
  * @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)} instead.
  */
@@ -44,4 +44,4 @@ public interface AffinityNodeHashResolver extends Serializable {
      */
     @Deprecated
     public Object resolve(ClusterNode node);
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java
index 6d8f91876abe7..1151245b6aeda 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java
@@ -44,7 +44,7 @@ public class BinaryConfiguration {
     private boolean compactFooter = DFLT_COMPACT_FOOTER;
 
     /**
-     * Sets class names of portable objects explicitly.
+     * Sets class names of binary objects explicitly.
      *
      * @param clsNames Class names.
      */
@@ -112,7 +112,7 @@ public void setTypeConfigurations(Collection typeCfgs)
 
     /**
      * Get whether to write footers in compact form. When enabled, Ignite will not write fields metadata
-     * when serializing objects, because internally {@code PortableMarshaller} already distribute metadata inside
+     * when serializing objects, because internally {@code BinaryMarshaller} already distribute metadata inside
      * cluster. This increases serialization performance.
      * 

      * WARNING! This mode should be disabled when already serialized data can be taken from some external
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
index 946b68649a734..ba0440373b5ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
@@ -141,8 +141,8 @@ public final class IgniteNodeAttributes {
     /** Node consistent id. */
     public static final String ATTR_NODE_CONSISTENT_ID = ATTR_PREFIX + ".consistent.id";
 
-    /** Portable protocol version. */
-    public static final String ATTR_PORTABLE_PROTO_VER = ATTR_PREFIX + ".portable.proto.ver";
+    /** Binary protocol version. */
+    public static final String ATTR_BINARY_PROTO_VER = ATTR_PREFIX + ".binary.proto.ver";
 
     /**
      * Enforces singleton.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 0c3275e0241c5..4a93bf6ea157b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -53,7 +53,7 @@
 import static java.lang.reflect.Modifier.isTransient;
 
 /**
- * Portable class descriptor.
+ * Binary class descriptor.
  */
 public class BinaryClassDescriptor {
     /** */
@@ -167,9 +167,9 @@ public class BinaryClassDescriptor {
             mode = BinaryWriteMode.EXCLUSION;
         else {
             if (cls == BinaryEnumObjectImpl.class)
-                mode = BinaryWriteMode.PORTABLE_ENUM;
+                mode = BinaryWriteMode.BINARY_ENUM;
             else
-                mode = serializer != null ? BinaryWriteMode.PORTABLE : BinaryUtils.mode(cls);
+                mode = serializer != null ? BinaryWriteMode.BINARY : BinaryUtils.mode(cls);
         }
 
         switch (mode) {
@@ -210,9 +210,9 @@ public class BinaryClassDescriptor {
             case OBJECT_ARR:
             case COL:
             case MAP:
-            case PORTABLE_OBJ:
+            case BINARY_OBJ:
             case ENUM:
-            case PORTABLE_ENUM:
+            case BINARY_ENUM:
             case ENUM_ARR:
             case CLASS:
             case EXCLUSION:
@@ -223,7 +223,7 @@ public class BinaryClassDescriptor {
 
                 break;
 
-            case PORTABLE:
+            case BINARY:
             case EXTERNALIZABLE:
                 ctor = constructor(cls);
                 fields = null;
@@ -284,7 +284,7 @@ public class BinaryClassDescriptor {
                 throw new BinaryObjectException("Invalid mode: " + mode);
         }
 
-        if (mode == BinaryWriteMode.PORTABLE || mode == BinaryWriteMode.EXTERNALIZABLE ||
+        if (mode == BinaryWriteMode.BINARY || mode == BinaryWriteMode.EXTERNALIZABLE ||
             mode == BinaryWriteMode.OBJECT) {
             readResolveMtd = U.findNonPublicMethod(cls, "readResolve");
             writeReplaceMtd = U.findNonPublicMethod(cls, "writeReplace");
@@ -362,14 +362,14 @@ public boolean excluded() {
     }
 
     /**
-     * @return portableWriteReplace() method
+     * @return binaryWriteReplace() method
      */
     @Nullable Method getWriteReplaceMethod() {
         return writeReplaceMtd;
     }
 
     /**
-     * @return portableReadResolve() method
+     * @return binaryReadResolve() method
      */
     @SuppressWarnings("UnusedDeclaration")
     @Nullable Method getReadResolveMethod() {
@@ -546,8 +546,8 @@ void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
 
                 break;
 
-            case PORTABLE_ENUM:
-                writer.doWritePortableEnum((BinaryEnumObjectImpl)obj);
+            case BINARY_ENUM:
+                writer.doWriteBinaryEnum((BinaryEnumObjectImpl)obj);
 
                 break;
 
@@ -561,12 +561,12 @@ void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
 
                 break;
 
-            case PORTABLE_OBJ:
-                writer.doWritePortableObject((BinaryObjectImpl)obj);
+            case BINARY_OBJ:
+                writer.doWriteBinaryObject((BinaryObjectImpl)obj);
 
                 break;
 
-            case PORTABLE:
+            case BINARY:
                 if (preWrite(writer, obj)) {
                     try {
                         if (serializer != null)
@@ -660,7 +660,7 @@ Object read(BinaryReaderExImpl reader) throws BinaryObjectException {
         Object res;
 
         switch (mode) {
-            case PORTABLE:
+            case BINARY:
                 res = newInstance();
 
                 reader.setHandle(res);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 6293cfec4c40c..7f9bacfcbad49 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -75,7 +75,7 @@
 import java.util.jar.JarFile;
 
 /**
- * Portable context.
+ * Binary context.
  */
 public class BinaryContext implements Externalizable {
     /** */
@@ -224,7 +224,7 @@ public IgniteConfiguration configuration(){
     }
 
     /**
-     * @param marsh Portable marshaller.
+     * @param marsh Binary marshaller.
      * @param cfg Configuration.
      * @throws BinaryObjectException In case of error.
      */
@@ -279,7 +279,7 @@ private void configure(
                 String clsName = typeCfg.getTypeName();
 
                 if (clsName == null)
-                    throw new BinaryObjectException("Class name is required for portable type configuration.");
+                    throw new BinaryObjectException("Class name is required for binary type configuration.");
 
                 BinaryIdMapper idMapper = globalIdMapper;
 
@@ -675,7 +675,7 @@ private String affinityFieldName(Class cls) {
     }
 
     /**
-     * @return Portable context.
+     * @return Binary context.
      * @throws ObjectStreamException In case of error.
      */
     protected Object readResolve() throws ObjectStreamException {
@@ -685,7 +685,7 @@ protected Object readResolve() throws ObjectStreamException {
             if (g == null)
                 throw new IllegalStateException("Failed to find grid for name: " + gridName);
 
-            return ((CacheObjectBinaryProcessorImpl)g.context().cacheObjects()).portableContext();
+            return ((CacheObjectBinaryProcessorImpl)g.context().cacheObjects()).binaryContext();
         }
         catch (IllegalStateException e) {
             throw U.withCause(new InvalidObjectException(e.getMessage()), e);
@@ -695,7 +695,7 @@ protected Object readResolve() throws ObjectStreamException {
     /**
      * @param cls Class.
      * @param id Type ID.
-     * @return GridPortableClassDescriptor.
+     * @return GridBinaryClassDescriptor.
      */
     public BinaryClassDescriptor registerPredefinedType(Class cls, int id) {
         String typeName = typeName(cls.getName());
@@ -1047,7 +1047,7 @@ private TypeDescriptor(String clsName, BinaryIdMapper idMapper, BinarySerializer
         }
 
         /**
-         * Override portable class descriptor.
+         * Override binary class descriptor.
          *
          * @param other Other descriptor.
          * @throws BinaryObjectException If failed.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
index 33211704cb35f..b2ee16fbf670b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
@@ -219,7 +219,7 @@ public BinaryEnumObjectImpl(BinaryContext ctx, int typeId, @Nullable String clsN
 
     /** {@inheritDoc} */
     @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException {
-        this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).portableContext();
+        this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).binaryContext();
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index 8cf1a117f1c3b..8050edde87b84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -103,8 +103,8 @@ public static BinaryFieldAccessor create(Field field, int id) {
             case TIMESTAMP_ARR:
             case ENUM_ARR:
             case OBJECT_ARR:
-            case PORTABLE_OBJ:
-            case PORTABLE:
+            case BINARY_OBJ:
+            case BINARY:
             case EXTERNALIZABLE:
                 return new DefaultFinalClassAccessor(field, id, mode, false);
 
@@ -608,8 +608,8 @@ private static class DefaultFinalClassAccessor extends BinaryFieldAccessor {
 
                     break;
 
-                case PORTABLE_OBJ:
-                    writer.writePortableObjectField((BinaryObjectImpl)val);
+                case BINARY_OBJ:
+                    writer.writeBinaryObjectField((BinaryObjectImpl)val);
 
                     break;
 
@@ -623,7 +623,7 @@ private static class DefaultFinalClassAccessor extends BinaryFieldAccessor {
 
                     break;
 
-                case PORTABLE:
+                case BINARY:
                 case EXTERNALIZABLE:
                 case OBJECT:
                     writer.writeObjectField(val);
@@ -809,8 +809,8 @@ protected Object readFixedType(BinaryReaderExImpl reader) throws BinaryObjectExc
 
                     break;
 
-                case PORTABLE_OBJ:
-                    val = reader.readPortableObject(id);
+                case BINARY_OBJ:
+                    val = reader.readBinaryObject(id);
 
                     break;
 
@@ -824,7 +824,7 @@ protected Object readFixedType(BinaryReaderExImpl reader) throws BinaryObjectExc
 
                     break;
 
-                case PORTABLE:
+                case BINARY:
                 case EXTERNALIZABLE:
                 case OBJECT:
                     val = reader.readObject(id);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java
index 7f516319dce2e..78ed17a5054c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java
@@ -24,7 +24,7 @@
 import org.apache.ignite.binary.BinaryField;
 
 /**
- * Implementation of portable field descriptor.
+ * Implementation of binary field descriptor.
  */
 public class BinaryFieldImpl implements BinaryField {
     /** Type ID. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
index 03bf9f9d69aaf..5480967562395 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
@@ -81,10 +81,10 @@ public MarshallerContext getContext() {
     /**
      * Sets {@link BinaryContext}.
      * 

-     * @param ctx Portable context.
+     * @param ctx Binary context.
      */
     @SuppressWarnings("UnusedDeclaration")
-    private void setPortableContext(BinaryContext ctx, IgniteConfiguration cfg) {
+    private void setBinaryContext(BinaryContext ctx, IgniteConfiguration cfg) {
         ctx.configure(this, cfg);
 
         impl = new GridBinaryMarshaller(ctx);
@@ -116,7 +116,7 @@ private void setPortableContext(BinaryContext ctx, IgniteConfiguration cfg) {
     @Override public  T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws IgniteCheckedException {
         ByteArrayOutputStream buf = new ByteArrayOutputStream();
 
-        // we have to fully read the InputStream because GridPortableMarshaller requires support of a method that
+        // we have to fully read the InputStream because GridBinaryMarshaller requires support of a method that
         // returns number of bytes remaining.
         try {
             byte[] arr = new byte[4096];
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
index a8ff1400708f1..7de73b80ec280 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
@@ -30,7 +30,7 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Portable metadata which is passed over a wire.
+ * Binary metadata which is passed over a wire.
  */
 public class BinaryMetadata implements Externalizable {
     /** */
@@ -146,7 +146,7 @@ public boolean isEnum() {
     /**
      * Wrap metadata into binary type.
      *
-     * @param ctx Portable context.
+     * @param ctx Binary context.
      * @return Binary type.
      */
     public BinaryTypeImpl wrap(BinaryContext ctx) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java
index fea2893fefc1c..29ff7b35df922 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.binary.BinaryType;
 
 /**
- * Portable meta data handler.
+ * Binary meta data handler.
  */
 public interface BinaryMetadataHandler {
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
index 252c49554ee76..404300dfcab70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
@@ -29,7 +29,7 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Internal portable object interface.
+ * Internal binary object interface.
  */
 public abstract class BinaryObjectExImpl implements BinaryObjectEx {
     /**
@@ -245,7 +245,7 @@ else if (val instanceof BigDecimal[])
             return toString(ctx, new IdentityHashMap());
         }
         catch (BinaryObjectException e) {
-            throw new IgniteException("Failed to create string representation of portable object.", e);
+            throw new IgniteException("Failed to create string representation of binary object.", e);
         }
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 9fd5901d737c6..2342766932fbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -46,7 +46,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
- * Portable object implementation.
+ * Binary object implementation.
  */
 @IgniteCodeGeneratingFail // Fields arr and start should not be generated by MessageCodeGenerator.
 public final class BinaryObjectImpl extends BinaryObjectExImpl implements Externalizable, KeyCacheObject {
@@ -142,7 +142,7 @@ public BinaryObjectImpl(BinaryContext ctx, byte[] arr, int start) {
 
     /** {@inheritDoc} */
     @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException {
-        this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).portableContext();
+        this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).binaryContext();
     }
 
     /** {@inheritDoc} */
@@ -156,7 +156,7 @@ public BinaryObjectImpl(BinaryContext ctx, byte[] arr, int start) {
     }
 
     /**
-     * @return Detached portable object.
+     * @return Detached binary object.
      */
     public BinaryObject detach() {
         if (!detachAllowed || detached())
@@ -227,7 +227,7 @@ public void context(BinaryContext ctx) {
     /** {@inheritDoc} */
     @Nullable @Override public BinaryType type() throws BinaryObjectException {
         if (ctx == null)
-            throw new BinaryObjectException("PortableContext is not set for the object.");
+            throw new BinaryObjectException("BinaryContext is not set for the object.");
 
         return ctx.metadata(typeId());
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
index 1206db7962be3..0246a36185476 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
@@ -45,7 +45,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
- *  Portable object implementation over offheap memory
+ *  Binary object implementation over offheap memory
  */
 public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Externalizable, CacheObject {
     /** */
@@ -141,7 +141,7 @@ public BinaryObject heapCopy() {
     /** {@inheritDoc} */
     @Nullable @Override public BinaryType type() throws BinaryObjectException {
         if (ctx == null)
-            throw new BinaryObjectException("PortableContext is not set for the object.");
+            throw new BinaryObjectException("BinaryContext is not set for the object.");
 
         return ctx.metadata(typeId());
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
index b673e27ad6305..8f9cc92865c3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
@@ -69,7 +69,7 @@
 import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OBJ;
 import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OBJ_ARR;
 import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OPTM_MARSH;
-import static org.apache.ignite.internal.binary.GridBinaryMarshaller.PORTABLE_OBJ;
+import static org.apache.ignite.internal.binary.GridBinaryMarshaller.BINARY_OBJ;
 import static org.apache.ignite.internal.binary.GridBinaryMarshaller.SHORT;
 import static org.apache.ignite.internal.binary.GridBinaryMarshaller.SHORT_ARR;
 import static org.apache.ignite.internal.binary.GridBinaryMarshaller.STRING;
@@ -81,11 +81,11 @@
 import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UUID_ARR;
 
 /**
- * Portable reader implementation.
+ * Binary reader implementation.
  */
 @SuppressWarnings("unchecked")
 public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, BinaryReaderHandlesHolder, ObjectInput {
-    /** Portable context. */
+    /** Binary context. */
     private final BinaryContext ctx;
 
     /** Input stream. */
@@ -185,7 +185,7 @@ public BinaryReaderExImpl(BinaryContext ctx, BinaryInputStream in, ClassLoader l
 
         start = in.position();
 
-        // Perform full header parsing in case of portable object.
+        // Perform full header parsing in case of binary object.
         if (!skipHdrCheck && (in.readByte() == GridBinaryMarshaller.OBJ)) {
             // Ensure protocol is fine.
             BinaryUtils.checkProtocolVersion(in.readByte());
@@ -312,12 +312,12 @@ public Object unmarshal(int offset) throws BinaryObjectException {
 
     /**
      * @param fieldId Field ID.
-     * @return Portable object.
+     * @return Binary object.
      * @throws BinaryObjectException In case of error.
      */
-    @Nullable BinaryObject readPortableObject(int fieldId) throws BinaryObjectException {
+    @Nullable BinaryObject readBinaryObject(int fieldId) throws BinaryObjectException {
         if (findFieldById(fieldId)) {
-            if (checkFlag(PORTABLE_OBJ) == Flag.NULL)
+            if (checkFlag(BINARY_OBJ) == Flag.NULL)
                 return null;
 
             return new BinaryObjectImpl(ctx, BinaryUtils.doReadByteArray(in), in.readInt());
@@ -1598,12 +1598,12 @@ else if (flag == NULL)
 
                 break;
 
-            case PORTABLE_OBJ:
-                obj = BinaryUtils.doReadPortableObject(in, ctx);
+            case BINARY_OBJ:
+                obj = BinaryUtils.doReadBinaryObject(in, ctx);
 
                 ((BinaryObjectImpl)obj).context(ctx);
 
-                if (!GridBinaryMarshaller.KEEP_PORTABLES.get())
+                if (!GridBinaryMarshaller.KEEP_BINARIES.get())
                     obj = ((BinaryObject)obj).deserialize();
 
                 break;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java
index 99e642cacc475..156ac0fc20305 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java
@@ -26,7 +26,7 @@
 import java.util.List;
 
 /**
- * Schema describing portable object content. We rely on the following assumptions:
+ * Schema describing binary object content. We rely on the following assumptions:
  * - When amount of fields in the object is low, it is better to inline these values into int fields thus allowing
  * for quick comparisons performed within already fetched L1 cache line.
  * - When there are more fields, we store them inside a hash map.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
index 6920a34276995..91f29b22cfd8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
@@ -22,7 +22,7 @@
 import java.util.HashMap;
 
 /**
- * Portable schema registry. Contains all well-known object schemas.
+ * Binary schema registry. Contains all well-known object schemas.
  * 

  * We rely on the fact that usually object has only few different schemas. For this reason we inline several
  * of them with optional fallback to normal hash map lookup.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
index 23aacb2cd50ee..d4fd625a188c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
@@ -25,7 +25,7 @@
  * Binary type implementation.
  */
 public class BinaryTypeImpl implements BinaryType {
-    /** Portable context. */
+    /** Binary context. */
     private final BinaryContext ctx;
 
     /** Type metadata. */
@@ -34,7 +34,7 @@ public class BinaryTypeImpl implements BinaryType {
     /**
      * Constructor.
      *
-     * @param ctx Portable context.
+     * @param ctx Binary context.
      * @param meta Type  metadata.
      */
     public BinaryTypeImpl(BinaryContext ctx, BinaryMetadata meta) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index d285df5a02b03..8b5ec68f68df9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -58,7 +58,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
- * Portable utils.
+ * Binary utils.
  */
 public class BinaryUtils {
     /** */
@@ -70,8 +70,8 @@ public class BinaryUtils {
     /** {@code true} if serialized value of this type cannot contain references to objects. */
     private static final boolean[] PLAIN_TYPE_FLAG = new boolean[102];
 
-    /** Portable classes. */
-    private static final Collection> PORTABLE_CLS = new HashSet<>();
+    /** Binary classes. */
+    private static final Collection> BINARY_CLS = new HashSet<>();
 
     /** Flag: user type. */
     public static final short FLAG_USR_TYP = 0x0001;
@@ -166,32 +166,32 @@ public class BinaryUtils {
             PLAIN_TYPE_FLAG[b] = true;
         }
 
-        PORTABLE_CLS.add(Byte.class);
-        PORTABLE_CLS.add(Short.class);
-        PORTABLE_CLS.add(Integer.class);
-        PORTABLE_CLS.add(Long.class);
-        PORTABLE_CLS.add(Float.class);
-        PORTABLE_CLS.add(Double.class);
-        PORTABLE_CLS.add(Character.class);
-        PORTABLE_CLS.add(Boolean.class);
-        PORTABLE_CLS.add(String.class);
-        PORTABLE_CLS.add(UUID.class);
-        PORTABLE_CLS.add(Date.class);
-        PORTABLE_CLS.add(Timestamp.class);
-        PORTABLE_CLS.add(BigDecimal.class);
-        PORTABLE_CLS.add(byte[].class);
-        PORTABLE_CLS.add(short[].class);
-        PORTABLE_CLS.add(int[].class);
-        PORTABLE_CLS.add(long[].class);
-        PORTABLE_CLS.add(float[].class);
-        PORTABLE_CLS.add(double[].class);
-        PORTABLE_CLS.add(char[].class);
-        PORTABLE_CLS.add(boolean[].class);
-        PORTABLE_CLS.add(String[].class);
-        PORTABLE_CLS.add(UUID[].class);
-        PORTABLE_CLS.add(Date[].class);
-        PORTABLE_CLS.add(Timestamp[].class);
-        PORTABLE_CLS.add(BigDecimal[].class);
+        BINARY_CLS.add(Byte.class);
+        BINARY_CLS.add(Short.class);
+        BINARY_CLS.add(Integer.class);
+        BINARY_CLS.add(Long.class);
+        BINARY_CLS.add(Float.class);
+        BINARY_CLS.add(Double.class);
+        BINARY_CLS.add(Character.class);
+        BINARY_CLS.add(Boolean.class);
+        BINARY_CLS.add(String.class);
+        BINARY_CLS.add(UUID.class);
+        BINARY_CLS.add(Date.class);
+        BINARY_CLS.add(Timestamp.class);
+        BINARY_CLS.add(BigDecimal.class);
+        BINARY_CLS.add(byte[].class);
+        BINARY_CLS.add(short[].class);
+        BINARY_CLS.add(int[].class);
+        BINARY_CLS.add(long[].class);
+        BINARY_CLS.add(float[].class);
+        BINARY_CLS.add(double[].class);
+        BINARY_CLS.add(char[].class);
+        BINARY_CLS.add(boolean[].class);
+        BINARY_CLS.add(String[].class);
+        BINARY_CLS.add(UUID[].class);
+        BINARY_CLS.add(Date[].class);
+        BINARY_CLS.add(Timestamp[].class);
+        BINARY_CLS.add(BigDecimal[].class);
 
         FIELD_TYPE_NAMES = new String[104];
 
@@ -210,7 +210,7 @@ public class BinaryUtils {
         FIELD_TYPE_NAMES[GridBinaryMarshaller.TIMESTAMP] = "Timestamp";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.ENUM] = "Enum";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.OBJ] = "Object";
-        FIELD_TYPE_NAMES[GridBinaryMarshaller.PORTABLE_OBJ] = "Object";
+        FIELD_TYPE_NAMES[GridBinaryMarshaller.BINARY_OBJ] = "Object";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.COL] = "Collection";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.MAP] = "Map";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.CLASS] = "Class";
@@ -547,7 +547,7 @@ public static boolean isPlainArrayType(int type) {
 
     /**
      * @param cls Class.
-     * @return Portable field type.
+     * @return Binary field type.
      */
     public static byte typeByClass(Class cls) {
         Byte type = PLAIN_CLASS_TO_FLAG.get(cls);
@@ -571,16 +571,16 @@ public static byte typeByClass(Class cls) {
     }
 
     /**
-     * Tells whether provided type is portable.
+     * Tells whether provided type is binary.
      *
      * @param cls Class to check.
-     * @return Whether type is portable.
+     * @return Whether type is binary.
      */
-    public static boolean isPortableType(Class cls) {
+    public static boolean isBinaryType(Class cls) {
         assert cls != null;
 
         return BinaryObject.class.isAssignableFrom(cls) ||
-            PORTABLE_CLS.contains(cls) ||
+            BINARY_CLS.contains(cls) ||
             cls.isEnum() ||
             (cls.isArray() && cls.getComponentType().isEnum());
     }
@@ -632,7 +632,7 @@ public static void checkProtocolVersion(byte protoVer) {
     }
 
     /**
-     * Get portable object length.
+     * Get binary object length.
      *
      * @param in Input stream.
      * @param start Start position.
@@ -801,7 +801,7 @@ public static BinaryMetadata mergeMetadata(@Nullable BinaryMetadata oldMeta, Bin
             // Check type name.
             if (!F.eq(oldMeta.typeName(), newMeta.typeName())) {
                 throw new BinaryObjectException(
-                    "Two portable types have duplicate type ID [" + "typeId=" + oldMeta.typeId() +
+                    "Two binary types have duplicate type ID [" + "typeId=" + oldMeta.typeId() +
                         ", typeName1=" + oldMeta.typeName() + ", typeName2=" + newMeta.typeName() + ']'
                 );
             }
@@ -944,9 +944,9 @@ else if (cls == Timestamp[].class)
         else if (cls.isArray())
             return cls.getComponentType().isEnum() ? BinaryWriteMode.ENUM_ARR : BinaryWriteMode.OBJECT_ARR;
         else if (cls == BinaryObjectImpl.class)
-            return BinaryWriteMode.PORTABLE_OBJ;
+            return BinaryWriteMode.BINARY_OBJ;
         else if (Binarylizable.class.isAssignableFrom(cls))
-            return BinaryWriteMode.PORTABLE;
+            return BinaryWriteMode.BINARY;
         else if (Externalizable.class.isAssignableFrom(cls))
             return BinaryWriteMode.EXTERNALIZABLE;
         else if (isSpecialCollection(cls))
@@ -1249,7 +1249,7 @@ public static Timestamp[] doReadTimestampArray(BinaryInputStream in) throws Bina
     /**
      * @return Value.
      */
-    public static BinaryObject doReadPortableObject(BinaryInputStream in, BinaryContext ctx) {
+    public static BinaryObject doReadBinaryObject(BinaryInputStream in, BinaryContext ctx) {
         if (in.offheapPointer() > 0) {
             int len = in.readInt();
 
@@ -1343,7 +1343,7 @@ public static Class doReadClass(BinaryInputStream in, BinaryContext ctx, ClassLo
     /**
      * Resolve the class.
      *
-     * @param ctx Portable context.
+     * @param ctx Binary context.
      * @param typeId Type ID.
      * @param clsName Class name.
      * @param ldr Class loaded.
@@ -1374,26 +1374,26 @@ public static Class resolveClass(BinaryContext ctx, int typeId, @Nullable String
     }
 
     /**
-     * Read portable enum.
+     * Read binary enum.
      *
      * @param in Input stream.
-     * @param ctx Portable context.
+     * @param ctx Binary context.
      * @param type Plain type.
      * @return Enum.
      */
-    private static BinaryEnumObjectImpl doReadPortableEnum(BinaryInputStream in, BinaryContext ctx,
+    private static BinaryEnumObjectImpl doReadBinaryEnum(BinaryInputStream in, BinaryContext ctx,
         EnumType type) {
         return new BinaryEnumObjectImpl(ctx, type.typeId, type.clsName, in.readInt());
     }
 
     /**
-     * Read portable enum array.
+     * Read binary enum array.
      *
      * @param in Input stream.
-     * @param ctx Portable context.
+     * @param ctx Binary context.
      * @return Enum array.
      */
-    private static Object[] doReadPortableEnumArray(BinaryInputStream in, BinaryContext ctx) {
+    private static Object[] doReadBinaryEnumArray(BinaryInputStream in, BinaryContext ctx) {
         int len = in.readInt();
 
         Object[] arr = (Object[]) Array.newInstance(BinaryObject.class, len);
@@ -1404,7 +1404,7 @@ private static Object[] doReadPortableEnumArray(BinaryInputStream in, BinaryCont
             if (flag == GridBinaryMarshaller.NULL)
                 arr[i] = null;
             else
-                arr[i] = doReadPortableEnum(in, ctx, doReadEnumType(in));
+                arr[i] = doReadBinaryEnum(in, ctx, doReadEnumType(in));
         }
 
         return arr;
@@ -1644,16 +1644,16 @@ public static Object doReadOptimized(BinaryInputStream in, BinaryContext ctx, @N
             case GridBinaryMarshaller.MAP:
                 return doReadMap(in, ctx, ldr, handles, false, null);
 
-            case GridBinaryMarshaller.PORTABLE_OBJ:
-                return doReadPortableObject(in, ctx);
+            case GridBinaryMarshaller.BINARY_OBJ:
+                return doReadBinaryObject(in, ctx);
 
             case GridBinaryMarshaller.ENUM:
-                return doReadPortableEnum(in, ctx, doReadEnumType(in));
+                return doReadBinaryEnum(in, ctx, doReadEnumType(in));
 
             case GridBinaryMarshaller.ENUM_ARR:
                 doReadEnumType(in); // Simply skip this part as we do not need it.
 
-                return doReadPortableEnumArray(in, ctx);
+                return doReadBinaryEnumArray(in, ctx);
 
             case GridBinaryMarshaller.CLASS:
                 return doReadClass(in, ctx, ldr);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
index 9a37bdb339b3b..90127f462754d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
@@ -133,13 +133,13 @@ public enum BinaryWriteMode {
     MAP(GridBinaryMarshaller.MAP),
 
     /** */
-    PORTABLE_OBJ(GridBinaryMarshaller.OBJ),
+    BINARY_OBJ(GridBinaryMarshaller.OBJ),
 
     /** */
     ENUM(GridBinaryMarshaller.ENUM),
 
-    /** Portable enum. */
-    PORTABLE_ENUM(GridBinaryMarshaller.ENUM),
+    /** Binary enum. */
+    BINARY_ENUM(GridBinaryMarshaller.ENUM),
 
     /** */
     ENUM_ARR(GridBinaryMarshaller.ENUM_ARR),
@@ -148,7 +148,7 @@ public enum BinaryWriteMode {
     CLASS(GridBinaryMarshaller.CLASS),
 
     /** */
-    PORTABLE(GridBinaryMarshaller.PORTABLE_OBJ),
+    BINARY(GridBinaryMarshaller.BINARY_OBJ),
 
     /** */
     EXTERNALIZABLE(GridBinaryMarshaller.OBJ),
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index f073dd0d933ff..6e05b40df1ec0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -41,7 +41,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
- * Portable writer implementation.
+ * Binary writer implementation.
  */
 public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, ObjectOutput {
     /** Length: integer. */
@@ -145,7 +145,7 @@ void marshal(Object obj, boolean enableReplace) throws BinaryObjectException {
         BinaryClassDescriptor desc = ctx.descriptorForClass(cls, false);
 
         if (desc == null)
-            throw new BinaryObjectException("Object is not portable: [class=" + cls + ']');
+            throw new BinaryObjectException("Object is not binary: [class=" + cls + ']');
 
         if (desc.excluded()) {
             out.writeByte(GridBinaryMarshaller.NULL);
@@ -748,7 +748,7 @@ void doWriteEnum(@Nullable Enum val) {
     /**
      * @param val Value.
      */
-    void doWritePortableEnum(BinaryEnumObjectImpl val) {
+    void doWriteBinaryEnum(BinaryEnumObjectImpl val) {
         assert val != null;
 
         int typeId = val.typeId();
@@ -819,9 +819,9 @@ void doWriteClass(@Nullable Class val) {
     }
 
     /**
-     * @param po Portable object.
+     * @param po Binary object.
      */
-    public void doWritePortableObject(@Nullable BinaryObjectImpl po) {
+    public void doWriteBinaryObject(@Nullable BinaryObjectImpl po) {
         if (po == null)
             out.writeByte(GridBinaryMarshaller.NULL);
         else {
@@ -829,7 +829,7 @@ public void doWritePortableObject(@Nullable BinaryObjectImpl po) {
 
             out.unsafeEnsure(1 + 4 + poArr.length + 4);
 
-            out.unsafeWriteByte(GridBinaryMarshaller.PORTABLE_OBJ);
+            out.unsafeWriteByte(GridBinaryMarshaller.BINARY_OBJ);
             out.unsafeWriteInt(poArr.length);
             out.writeByteArray(poArr);
             out.unsafeWriteInt(po.start());
@@ -1176,11 +1176,11 @@ void writeEnumArrayField(@Nullable Object[] val) {
     }
 
     /**
-     * @param po Portable object.
+     * @param po Binary object.
      * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
      */
-    void writePortableObjectField(@Nullable BinaryObjectImpl po) throws BinaryObjectException {
-        doWritePortableObject(po);
+    void writeBinaryObjectField(@Nullable BinaryObjectImpl po) throws BinaryObjectException {
+        doWriteBinaryObject(po);
     }
 
     /** {@inheritDoc} */
@@ -1760,7 +1760,7 @@ public BinaryWriterExImpl newWriter(int typeId) {
     }
 
     /**
-     * @return Portable context.
+     * @return Binary context.
      */
     public BinaryContext context() {
         return ctx;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index 277abd0f43cf8..b21c679aad20d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -24,11 +24,11 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Portable objects marshaller.
+ * Binary objects marshaller.
  */
 public class GridBinaryMarshaller {
     /** */
-    public static final ThreadLocal KEEP_PORTABLES = new ThreadLocal() {
+    public static final ThreadLocal KEEP_BINARIES = new ThreadLocal() {
         @Override protected Boolean initialValue() {
             return true;
         }
@@ -119,7 +119,7 @@ public class GridBinaryMarshaller {
     public static final byte MAP = 25;
 
     /** */
-    public static final byte PORTABLE_OBJ = 27;
+    public static final byte BINARY_OBJ = 27;
 
     /** */
     public static final byte ENUM = 28;
@@ -230,7 +230,7 @@ public byte[] marshal(@Nullable Object obj) throws BinaryObjectException {
 
     /**
      * @param bytes Bytes array.
-     * @return Portable object.
+     * @return Binary object.
      * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
      */
     @SuppressWarnings("unchecked")
@@ -242,7 +242,7 @@ public byte[] marshal(@Nullable Object obj) throws BinaryObjectException {
 
     /**
      * @param in Input stream.
-     * @return Portable object.
+     * @return Binary object.
      * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
      */
     @SuppressWarnings("unchecked")
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
index d8dd00b647586..bc5eb9e030b35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
@@ -46,7 +46,7 @@ public BinaryBuilderEnum(int typeId, Enum anEnum) {
     }
 
     /**
-     * @param reader PortableBuilderReader.
+     * @param reader BinaryBuilderReader.
      */
     public BinaryBuilderEnum(BinaryBuilderReader reader) {
         int typeId = reader.readInt();
@@ -57,13 +57,13 @@ public BinaryBuilderEnum(BinaryBuilderReader reader) {
             Class cls;
 
             try {
-                cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+                cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
             }
             catch (ClassNotFoundException e) {
                 throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
             }
 
-            this.typeId = reader.portableContext().descriptorForClass(cls, false).typeId();
+            this.typeId = reader.binaryContext().descriptorForClass(cls, false).typeId();
         }
         else {
             this.typeId = typeId;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
index 9b9e8b871cb57..662ad1dc800b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
@@ -58,7 +58,7 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
     /*
      * Constructor.
      *
-     * @param objImpl Portable object
+     * @param objImpl Binary object
      */
     BinaryBuilderReader(BinaryObjectImpl objImpl) {
         ctx = objImpl.context();
@@ -89,14 +89,14 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
     }
 
     /**
-     * @return Portable context.
+     * @return Binary context.
      */
-    public BinaryContext portableContext() {
+    public BinaryContext binaryContext() {
         return ctx;
     }
 
     /**
-     * @param obj Mutable portable object.
+     * @param obj Mutable binary object.
      */
     public void registerObject(BinaryObjectBuilderImpl obj) {
         objMap.put(obj.start(), obj);
@@ -343,7 +343,7 @@ public void skipValue() {
                 return;
             }
 
-            case GridBinaryMarshaller.PORTABLE_OBJ:
+            case GridBinaryMarshaller.BINARY_OBJ:
                 len = readInt() + 4;
 
                 break;
@@ -460,14 +460,14 @@ public Object getValueQuickly(int pos, int len) {
                 return builderEnum;
             }
 
-            case GridBinaryMarshaller.PORTABLE_OBJ: {
+            case GridBinaryMarshaller.BINARY_OBJ: {
                 int size = readIntPositioned(pos + 1);
 
                 int start = readIntPositioned(pos + 4 + size);
 
-                BinaryObjectImpl portableObj = new BinaryObjectImpl(ctx, arr, pos + 4 + start);
+                BinaryObjectImpl binaryObj = new BinaryObjectImpl(ctx, arr, pos + 4 + start);
 
-                return new BinaryPlainBinaryObject(portableObj);
+                return new BinaryPlainBinaryObject(binaryObj);
             }
 
             default:
@@ -739,17 +739,17 @@ else if (flag == GridBinaryMarshaller.DECIMAL) {
             case GridBinaryMarshaller.ENUM_ARR:
                 return new BinaryEnumArrayLazyValue(this);
 
-            case GridBinaryMarshaller.PORTABLE_OBJ: {
+            case GridBinaryMarshaller.BINARY_OBJ: {
                 int size = readInt();
 
                 pos += size;
 
                 int start = readInt();
 
-                BinaryObjectImpl portableObj = new BinaryObjectImpl(ctx, arr,
+                BinaryObjectImpl binaryObj = new BinaryObjectImpl(ctx, arr,
                     pos - 4 - size + start);
 
-                return new BinaryPlainBinaryObject(portableObj);
+                return new BinaryPlainBinaryObject(binaryObj);
             }
 
             default:
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
index 458602d158948..a095242ebe460 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
@@ -37,7 +37,7 @@ class BinaryBuilderSerializer {
     private final Map objToPos = new IdentityHashMap<>();
 
     /** */
-    private Map portableObjToWrapper;
+    private Map binaryObjToWrapper;
 
     /**
      * @param obj Mutable object.
@@ -65,15 +65,15 @@ public void writeValue(BinaryWriterExImpl writer, Object val) {
         }
 
         if (val instanceof BinaryObjectExImpl) {
-            if (portableObjToWrapper == null)
-                portableObjToWrapper = new IdentityHashMap<>();
+            if (binaryObjToWrapper == null)
+                binaryObjToWrapper = new IdentityHashMap<>();
 
-            BinaryObjectBuilderImpl wrapper = portableObjToWrapper.get(val);
+            BinaryObjectBuilderImpl wrapper = binaryObjToWrapper.get(val);
 
             if (wrapper == null) {
                 wrapper = BinaryObjectBuilderImpl.wrap((BinaryObject)val);
 
-                portableObjToWrapper.put((BinaryObject)val, wrapper);
+                binaryObjToWrapper.put((BinaryObject)val, wrapper);
             }
 
             val = wrapper;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
index db55050bcfe07..787ff638b995e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
@@ -50,13 +50,13 @@ protected BinaryEnumArrayLazyValue(BinaryBuilderReader reader) {
             Class cls;
 
             try {
-                cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+                cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
             }
             catch (ClassNotFoundException e) {
                 throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
             }
 
-            compTypeId = reader.portableContext().descriptorForClass(cls, true).typeId();
+            compTypeId = reader.binaryContext().descriptorForClass(cls, true).typeId();
         }
         else {
             compTypeId = typeId;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
index 3627b1de5264b..21d7dcb853db8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
@@ -160,7 +160,7 @@ private void ensureDelegateInit() {
             for (Object o : delegate)
                 ctx.writeValue(writer, o);
 
-            // PortableBuilderImpl might have been written. It could override reader's position.
+            // BinaryBuilderImpl might have been written. It could override reader's position.
             reader.position(oldPos);
         }
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
index c82ff7d5f2999..6afe7981df249 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
@@ -52,7 +52,7 @@ private BinaryLazyMap(BinaryBuilderReader reader, int off) {
 
     /**
      * @param reader Reader.
-     * @return PortableLazyMap.
+     * @return BinaryLazyMap.
      */
     @Nullable public static BinaryLazyMap parseMap(BinaryBuilderReader reader) {
         int off = reader.position() - 1;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
index 05713b4dea615..8962107c77ac8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
@@ -49,13 +49,13 @@ protected BinaryObjectArrayLazyValue(BinaryBuilderReader reader) {
             Class cls;
 
             try {
-                cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+                cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
             }
             catch (ClassNotFoundException e) {
                 throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
             }
 
-            compTypeId = reader.portableContext().descriptorForClass(cls, true).typeId();
+            compTypeId = reader.binaryContext().descriptorForClass(cls, true).typeId();
         }
         else {
             compTypeId = typeId;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
index 5e60a202bacd8..8353cdb4ab5c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
@@ -70,7 +70,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
     /** */
     private Map readCache;
 
-    /** Position of object in source array, or -1 if object is not created from PortableObject. */
+    /** Position of object in source array, or -1 if object is not created from BinaryObject. */
     private final int start;
 
     /** Flags. */
@@ -79,7 +79,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
     /** Total header length */
     private final int hdrLen;
 
-    /** Context of PortableObject reading process. Or {@code null} if object is not created from PortableObject. */
+    /** Context of BinaryObject reading process. Or {@code null} if object is not created from BinaryObject. */
     private final BinaryBuilderReader reader;
 
     /** */
@@ -87,7 +87,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
 
     /**
      * @param clsName Class name.
-     * @param ctx Portable context.
+     * @param ctx Binary context.
      */
     public BinaryObjectBuilderImpl(BinaryContext ctx, String clsName) {
         this(ctx, ctx.typeId(clsName), BinaryContext.typeName(clsName));
@@ -134,7 +134,7 @@ public BinaryObjectBuilderImpl(BinaryObjectImpl obj) {
         BinaryUtils.checkProtocolVersion(ver);
 
         int typeId = reader.readIntPositioned(start + GridBinaryMarshaller.TYPE_ID_POS);
-        ctx = reader.portableContext();
+        ctx = reader.binaryContext();
         hashCode = reader.readIntPositioned(start + GridBinaryMarshaller.HASH_CODE_POS);
 
         if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID) {
@@ -525,7 +525,7 @@ private void ensureReadCacheInit() {
     }
 
     /**
-     * Removes field from portable object.
+     * Removes field from binary object.
      *
      * @param name Field name.
      * @return {@code this} instance for chaining.
@@ -540,9 +540,9 @@ private void ensureReadCacheInit() {
     }
 
     /**
-     * Creates builder initialized by specified portable object.
+     * Creates builder initialized by specified binary object.
      *
-     * @param obj Portable object to initialize builder.
+     * @param obj Binary object to initialize builder.
      * @return New builder.
      */
     public static BinaryObjectBuilderImpl wrap(BinaryObject obj) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
index 5ac4e97777a8c..f6432c3511621 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
@@ -27,27 +27,27 @@
  */
 public class BinaryPlainBinaryObject implements BinaryLazyValue {
     /** */
-    private final BinaryObject portableObj;
+    private final BinaryObject binaryObj;
 
     /**
-     * @param portableObj Portable object.
+     * @param binaryObj Binary object.
      */
-    public BinaryPlainBinaryObject(BinaryObject portableObj) {
-        this.portableObj = portableObj;
+    public BinaryPlainBinaryObject(BinaryObject binaryObj) {
+        this.binaryObj = binaryObj;
     }
 
     /** {@inheritDoc} */
     @Override public Object value() {
-        return portableObj;
+        return binaryObj;
     }
 
     /** {@inheritDoc} */
     @Override public void writeTo(BinaryWriterExImpl writer, BinaryBuilderSerializer ctx) {
-        BinaryObject val = portableObj;
+        BinaryObject val = binaryObj;
 
         if (val instanceof BinaryObjectOffheapImpl)
             val = ((BinaryObjectOffheapImpl)val).heapCopy();
 
-        writer.doWritePortableObject((BinaryObjectImpl)val);
+        writer.doWriteBinaryObject((BinaryObjectImpl)val);
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
index f2c4b5593d56c..15aa947b1f921 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
@@ -17,6 +17,6 @@
 
 /**
  * 
- * Contains classes specific to portable builder API.
+ * Contains classes specific to binary builder API.
  */
 package org.apache.ignite.internal.binary.builder;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
index 4bb0fb150b906..849ef5f87c972 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
@@ -17,6 +17,6 @@
 
 /**
  * 
- * Contains portable APIs internal implementation.
+ * Contains binary APIs internal implementation.
  */
 package org.apache.ignite.internal.binary;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
index e3be794ab84ed..334f455847123 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.binary.BinaryObjectException;
 
 /**
- * Portable abstract input stream.
+ * Binary abstract input stream.
  */
 public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
     implements BinaryInputStream {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
index 199ee71539e61..4221cbe10990c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Base portable output stream.
+ * Base binary output stream.
  */
 public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
     implements BinaryOutputStream {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
index ce5763112b381..1e8ce0935932c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
@@ -22,7 +22,7 @@
 import sun.misc.Unsafe;
 
 /**
- * Portable abstract stream.
+ * Binary abstract stream.
  */
 public abstract class BinaryAbstractStream implements BinaryStream {
     /** Byte: zero. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
index 502b9dc627d1b..732b8c7572ca8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
@@ -20,7 +20,7 @@
 import java.util.Arrays;
 
 /**
- * Portable off-heap input stream.
+ * Binary off-heap input stream.
  */
 public final class BinaryHeapInputStream extends BinaryAbstractInputStream {
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
index 02c3441aa90bf..7553f3ba6278a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable heap output stream.
+ * Binary heap output stream.
  */
 public final class BinaryHeapOutputStream extends BinaryAbstractOutputStream {
     /** Allocator. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
index 63457e40a15bc..176571518cbab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.binary.BinaryPositionReadable;
 
 /**
- * Portable input stream.
+ * Binary input stream.
  */
 public interface BinaryInputStream extends BinaryStream, BinaryPositionReadable {
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
index dc18c9e63185f..cff002f8724e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable off-heap input stream.
+ * Binary off-heap input stream.
  */
 public class BinaryOffheapInputStream extends BinaryAbstractInputStream {
     /** Pointer. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
index 24b65b2ea304b..080a3574b0996 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable offheap output stream.
+ * Binary offheap output stream.
  */
 public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
     /** Pointer. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
index 1c3f4bf2b96b8..84941203acd72 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable output stream.
+ * Binary output stream.
  */
 public interface BinaryOutputStream extends BinaryStream, AutoCloseable {
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
index 229e34c56ec18..b868199edd10b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.binary.streams;
 
 /**
- * Portable stream.
+ * Binary stream.
  */
 public interface BinaryStream {
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
index 2a6ad6281cb0c..8ce839c021c9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
@@ -17,6 +17,6 @@
 
 /**
  * 
- * Contains portable APIs implementation for streams.
+ * Contains binary APIs implementation for streams.
  */
 package org.apache.ignite.internal.binary.streams;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
index 382141c8d53a9..2e4831e11e495 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
@@ -27,15 +27,15 @@ public enum GridClientCacheFlag {
     SKIP_STORE,
 
     /**
-     * Disable deserialization of portable objects on get operations.
-     * If set and portable marshaller is used, {@link GridClientData#get(Object)}
+     * Disable deserialization of binary objects on get operations.
+     * If set and binary marshaller is used, {@link GridClientData#get(Object)}
      * and {@link GridClientData#getAll(Collection)} methods will return
-     * instances of {@code PortableObject} class instead of user objects.
+     * instances of {@code BinaryObject} class instead of user objects.
      * Use this flag if you don't have corresponding class on your client of
      * if you want to get access to some individual fields, but do not want to
      * fully deserialize the object.
      */
-    KEEP_PORTABLES;
+    KEEP_BINARIES;
 
     /** */
     private static final GridClientCacheFlag[] VALS = values();
@@ -49,4 +49,4 @@ public enum GridClientCacheFlag {
     public static GridClientCacheFlag fromOrdinal(int ord) {
         return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
index e7255f9383f65..c0e31c73d14dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
@@ -416,5 +416,5 @@ public List refreshTopology(boolean includeAttrs, boolean includ
     /**
      * Sets keep binary flag for the next task execution in the current thread.
      */
-    public GridClientCompute withKeepPortables();
-}
\ No newline at end of file
+    public GridClientCompute withKeepBinaries();
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index 2015970774ec9..e9d2958541665 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -615,7 +615,7 @@ public void setExecutorService(ExecutorService executor) {
      * Options, that can be used out-of-the-box:
      * 
    
      *     
  • {@link GridClientOptimizedMarshaller} (default) - Ignite's optimized marshaller.
    • 
-     *     
  • {@code GridClientPortableMarshaller} - Marshaller that supports portable objects.
    • 
+     *     
  • {@code GridClientBinaryMarshaller} - Marshaller that supports binary objects.
    • 
      *     
  • {@link org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller} - JDK marshaller (not recommended).
    • 
      * 

      *
@@ -850,4 +850,4 @@ public void setDaemon(boolean daemon) {
     public boolean isDaemon() {
         return daemon;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
index 0c3b1552adf88..463a07410a243 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
@@ -41,7 +41,7 @@
  */
 class GridClientComputeImpl extends GridClientAbstractProjection implements GridClientCompute {
     /** */
-    private static final ThreadLocal KEEP_PORTABLES = new ThreadLocal() {
+    private static final ThreadLocal KEEP_BINARIES = new ThreadLocal() {
         @Override protected Boolean initialValue() {
             return false;
         }
@@ -125,14 +125,14 @@ class GridClientComputeImpl extends GridClientAbstractProjection GridClientFuture executeAsync(final String taskName, final Object taskArg) {
         A.notNull(taskName, "taskName");
 
-        final boolean keepPortables = KEEP_PORTABLES.get();
+        final boolean keepBinaries = KEEP_BINARIES.get();
 
-        KEEP_PORTABLES.set(false);
+        KEEP_BINARIES.set(false);
 
         return withReconnectHandling(new ClientProjectionClosure() {
             @Override public GridClientFuture apply(GridClientConnection conn, UUID destNodeId)
                 throws GridClientConnectionResetException, GridClientClosedException {
-                return conn.execute(taskName, taskArg, destNodeId, keepPortables);
+                return conn.execute(taskName, taskArg, destNodeId, keepBinaries);
             }
         });
     }
@@ -148,14 +148,14 @@ class GridClientComputeImpl extends GridClientAbstractProjection() {
             @Override public GridClientFuture apply(GridClientConnection conn, UUID destNodeId)
                 throws GridClientConnectionResetException, GridClientClosedException {
-                return conn.execute(taskName, taskArg, destNodeId, keepPortables);
+                return conn.execute(taskName, taskArg, destNodeId, keepBinaries);
             }
         }, cacheName, affKey);
     }
@@ -254,8 +254,8 @@ class GridClientComputeImpl extends GridClientAbstractProjection GridClientFutureAdapter cachePrepend(String cach
      * @param taskName Task name.
      * @param arg Task argument.
      * @param destNodeId Destination node ID.
-     * @param keepPortables Keep binary flag.
+     * @param keepBinaries Keep binary flag.
      * @return Task execution result.
      * @throws GridClientConnectionResetException In case of error.
      * @throws GridClientClosedException If client was manually closed before request was sent over network.
      */
     public abstract  GridClientFutureAdapter execute(String taskName, Object arg, UUID destNodeId,
-        boolean keepPortables) throws GridClientConnectionResetException, GridClientClosedException;
+        boolean keepBinaries) throws GridClientConnectionResetException, GridClientClosedException;
 
     /**
      * Gets node by node ID.
@@ -514,4 +514,4 @@ protected String getCloseReasonMessage(GridClientConnectionCloseReason reason, @
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index dedee109c6b2d..1bea3cc064a26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -462,7 +462,7 @@ protected GridClientConnection connect(@Nullable UUID nodeId, InetSocketAddress
             if (cfg.getProtocol() == GridClientProtocol.TCP) {
                 conn = new GridClientNioTcpConnection(srv, clientId, addr, sslCtx, pingExecutor,
                     cfg.getConnectTimeout(), cfg.getPingInterval(), cfg.getPingTimeout(),
-                    cfg.isTcpNoDelay(), cfg.getMarshaller(), marshId, top, cred, keepPortablesThreadLocal());
+                    cfg.isTcpNoDelay(), cfg.getMarshaller(), marshId, top, cred, keepBinariesThreadLocal());
             }
             else
                 throw new GridServerUnreachableException("Failed to create client (protocol is not supported): " +
@@ -485,7 +485,7 @@ protected GridClientConnection connect(@Nullable UUID nodeId, InetSocketAddress
     /**
      * @return Get thread local used to enable keep binary mode.
      */
-    protected ThreadLocal keepPortablesThreadLocal() {
+    protected ThreadLocal keepBinariesThreadLocal() {
         return null;
     }
 
@@ -668,4 +668,4 @@ private void handleHandshakeResponse(GridClientFutureAdapter handshakeF
             ses.close();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
index 24c9c709c0bb9..576df3a5543af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
@@ -79,7 +79,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES;
+import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_BINARIES;
 import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CONN_IDLE;
 import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED;
 import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.APPEND;
@@ -156,7 +156,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
     private final GridClientMarshaller marsh;
 
     /** */
-    private final ThreadLocal keepPortablesMode;
+    private final ThreadLocal keepBinariesMode;
 
     /**
      * Creates a client facade, tries to connect to remote server, in case of success starts reader thread.
@@ -190,7 +190,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
         Byte marshId,
         GridClientTopology top,
         Object cred,
-        ThreadLocal keepPortablesMode
+        ThreadLocal keepBinariesMode
     ) throws IOException, GridClientException {
         super(clientId, srvAddr, sslCtx, top, cred);
 
@@ -199,7 +199,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
         this.marsh = marsh;
         this.pingInterval = pingInterval;
         this.pingTimeout = pingTimeout;
-        this.keepPortablesMode = keepPortablesMode;
+        this.keepBinariesMode = keepBinariesMode;
 
         SocketChannel ch = null;
         Socket sock = null;
@@ -385,16 +385,16 @@ private  GridClientFutureAdapter makeRequest(GridClientMessage msg, UUID d
      *
      * @param msg Message to request,
      * @param destId Destination node identifier.
-     * @param keepPortables Keep binary flag.
+     * @param keepBinaries Keep binary flag.
      * @return Response object.
      * @throws GridClientConnectionResetException If request failed.
      * @throws GridClientClosedException If client was closed.
      */
-    private  GridClientFutureAdapter makeRequest(GridClientMessage msg, UUID destId, boolean keepPortables)
+    private  GridClientFutureAdapter makeRequest(GridClientMessage msg, UUID destId, boolean keepBinaries)
         throws GridClientConnectionResetException, GridClientClosedException {
         assert msg != null;
 
-        TcpClientFuture res = new TcpClientFuture<>(false, keepPortables);
+        TcpClientFuture res = new TcpClientFuture<>(false, keepBinaries);
 
         msg.destinationId(destId);
 
@@ -667,7 +667,7 @@ private GridClientAuthenticationRequest buildAuthRequest() {
         req.keys((Iterable)keys);
         req.cacheFlagsOn(encodeCacheFlags(flags));
 
-        return makeRequest(req, destNodeId, flags.contains(KEEP_PORTABLES));
+        return makeRequest(req, destNodeId, flags.contains(KEEP_BINARIES));
     }
 
     /** {@inheritDoc} */
@@ -786,12 +786,12 @@ private GridClientAuthenticationRequest buildAuthRequest() {
 
     /** {@inheritDoc} */
     @Override public  GridClientFutureAdapter execute(String taskName, Object arg, UUID destNodeId,
-        final boolean keepPortables) throws GridClientConnectionResetException, GridClientClosedException {
+        final boolean keepBinaries) throws GridClientConnectionResetException, GridClientClosedException {
         GridClientTaskRequest msg = new GridClientTaskRequest();
 
         msg.taskName(taskName);
         msg.argument(arg);
-        msg.keepPortables(keepPortables);
+        msg.keepBinaries(keepBinaries);
 
         return this.makeRequest(msg, destNodeId).chain(
             new GridClientFutureCallback() {
@@ -1038,7 +1038,7 @@ private static class TcpClientFuture extends GridClientFutureAdapter {
         private final boolean forward;
 
         /** Keep binary flag. */
-        private final boolean keepPortables;
+        private final boolean keepBinaries;
 
         /** Pending message for this future. */
         private GridClientMessage pendingMsg;
@@ -1052,7 +1052,7 @@ private static class TcpClientFuture extends GridClientFutureAdapter {
          */
         private TcpClientFuture() {
             forward = false;
-            keepPortables = false;
+            keepBinaries = false;
         }
 
         /**
@@ -1060,9 +1060,9 @@ private TcpClientFuture() {
          *
          * @param forward Flag value.
          */
-        private TcpClientFuture(boolean forward, boolean keepPortables) {
+        private TcpClientFuture(boolean forward, boolean keepBinaries) {
             this.forward = forward;
-            this.keepPortables = keepPortables;
+            this.keepBinaries = keepBinaries;
         }
 
         /**
@@ -1103,8 +1103,8 @@ public boolean forward() {
         /**
          * @return Keep binary flag.
          */
-        public boolean keepPortables() {
-            return keepPortables;
+        public boolean keepBinaries() {
+            return keepBinaries;
         }
 
         /** {@inheritDoc} */
@@ -1112,4 +1112,4 @@ public boolean keepPortables() {
             return "TcpClientFuture [state=" + authRetry + ", forward=" + forward + ", message=" + pendingMsg + "]";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
index 4f9c188c7ddfe..9b3dd159d2494 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
@@ -37,10 +37,10 @@ public class CacheDefaultBinaryAffinityKeyMapper extends GridCacheDefaultAffinit
     /** {@inheritDoc} */
     @Override public Object affinityKey(Object key) {
         try {
-            key = proc.toPortable(key);
+            key = proc.toBinary(key);
         }
         catch (IgniteException e) {
-            U.error(log, "Failed to marshal key to portable: " + key, e);
+            U.error(log, "Failed to marshal key to binary: " + key, e);
         }
 
         if (key instanceof BinaryObject)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
index 2de26fc930314..2ecfdbfb52a69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
@@ -50,9 +50,9 @@ public CacheInvokeEntry(GridCacheContext cctx,
         KeyCacheObject keyObj,
         @Nullable CacheObject valObj,
         GridCacheVersion ver,
-        boolean keepPortable
+        boolean keepBinary
     ) {
-        super(cctx, keyObj, valObj, keepPortable);
+        super(cctx, keyObj, valObj, keepBinary);
 
         this.hadVal = valObj != null;
         this.ver = ver;
@@ -72,9 +72,9 @@ public CacheInvokeEntry(GridCacheContext ctx,
         @Nullable CacheObject valObj,
         @Nullable V val,
         GridCacheVersion ver,
-        boolean keepPortable
+        boolean keepBinary
     ) {
-        super(ctx, keyObj, key, valObj, val, keepPortable);
+        super(ctx, keyObj, key, valObj, val, keepBinary);
 
         this.hadVal = valObj != null || val != null;
         this.ver = ver;
@@ -152,4 +152,4 @@ private static enum Operation {
         /** */
         REMOVE
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
index 713bb3f6fa34a..05a6fef8387c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
@@ -43,19 +43,19 @@ public class CacheLazyEntry implements Cache.Entry {
     @GridToStringInclude
     protected V val;
 
-    /** Keep portable flag. */
-    private boolean keepPortable;
+    /** Keep binary flag. */
+    private boolean keepBinary;
 
     /**
      * @param cctx Cache context.
      * @param keyObj Key cache object.
      * @param valObj Cache object value.
      */
-    public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, CacheObject valObj, boolean keepPortable) {
+    public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, CacheObject valObj, boolean keepBinary) {
         this.cctx = cctx;
         this.keyObj = keyObj;
         this.valObj = valObj;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /**
@@ -63,11 +63,11 @@ public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, CacheObject
      * @param val Value.
      * @param cctx Cache context.
      */
-    public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, V val, boolean keepPortable) {
+    public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, V val, boolean keepBinary) {
         this.cctx = cctx;
         this.keyObj = keyObj;
         this.val = val;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /**
@@ -82,38 +82,38 @@ public CacheLazyEntry(GridCacheContext ctx,
         K key,
         CacheObject valObj,
         V val,
-        boolean keepPortable
+        boolean keepBinary
     ) {
         this.cctx = ctx;
         this.keyObj = keyObj;
         this.key = key;
         this.valObj = valObj;
         this.val = val;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /** {@inheritDoc} */
     @Override public K getKey() {
         if (key == null)
-            key = (K)cctx.unwrapPortableIfNeeded(keyObj, keepPortable);
+            key = (K)cctx.unwrapBinaryIfNeeded(keyObj, keepBinary);
 
         return key;
     }
 
     /** {@inheritDoc} */
     @Override public V getValue() {
-        return getValue(keepPortable);
+        return getValue(keepBinary);
     }
 
     /**
      * Returns the value stored in the cache when this entry was created.
      *
-     * @param keepPortable Flag to keep portable if needed.
+     * @param keepBinary Flag to keep binary if needed.
      * @return the value corresponding to this entry
      */
-    public V getValue(boolean keepPortable) {
+    public V getValue(boolean keepBinary) {
         if (val == null)
-            val = (V)cctx.unwrapPortableIfNeeded(valObj, keepPortable, false);
+            val = (V)cctx.unwrapBinaryIfNeeded(valObj, keepBinary, false);
 
         return val;
     }
@@ -147,4 +147,4 @@ else if (cls.isAssignableFrom(getClass()))
     public String toString() {
         return S.toString(CacheLazyEntry.class, this);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
index 88a802771a23c..740143405e798 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
@@ -125,69 +125,69 @@ public IgniteCacheObjectProcessor processor() {
 
     /**
      * @param o Object to unwrap.
-     * @param keepPortable Keep binary flag.
+     * @param keepBinary Keep binary flag.
      * @return Unwrapped object.
      */
-    public Object unwrapPortableIfNeeded(Object o, boolean keepPortable) {
-        return unwrapPortableIfNeeded(o, keepPortable, true);
+    public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary) {
+        return unwrapBinaryIfNeeded(o, keepBinary, true);
     }
 
     /**
      * @param o Object to unwrap.
-     * @param keepPortable Keep binary flag.
+     * @param keepBinary Keep binary flag.
      * @param cpy Copy value flag.
      * @return Unwrapped object.
      */
-    public Object unwrapPortableIfNeeded(Object o, boolean keepPortable, boolean cpy) {
+    public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary, boolean cpy) {
         if (o == null)
             return null;
 
-        return unwrapPortable(o, keepPortable, cpy);
+        return unwrapBinary(o, keepBinary, cpy);
     }
 
     /**
      * @param col Collection of objects to unwrap.
-     * @param keepPortable Keep binary flag.
+     * @param keepBinary Keep binary flag.
      * @return Unwrapped collection.
      */
-    public Collection unwrapPortablesIfNeeded(Collection col, boolean keepPortable) {
-        return unwrapPortablesIfNeeded(col, keepPortable, true);
+    public Collection unwrapBinariesIfNeeded(Collection col, boolean keepBinary) {
+        return unwrapBinariesIfNeeded(col, keepBinary, true);
     }
 
     /**
      * @param col Collection to unwrap.
-     * @param keepPortable Keep binary flag.
+     * @param keepBinary Keep binary flag.
      * @param cpy Copy value flag.
      * @return Unwrapped collection.
      */
-    public Collection unwrapPortablesIfNeeded(Collection col, boolean keepPortable, boolean cpy) {
+    public Collection unwrapBinariesIfNeeded(Collection col, boolean keepBinary, boolean cpy) {
         if (col instanceof ArrayList)
-            return unwrapPortables((ArrayList)col, keepPortable, cpy);
+            return unwrapBinaries((ArrayList)col, keepBinary, cpy);
 
         if (col instanceof Set)
-            return unwrapPortables((Set)col, keepPortable, cpy);
+            return unwrapBinaries((Set)col, keepBinary, cpy);
 
         Collection col0 = new ArrayList<>(col.size());
 
         for (Object obj : col)
-            col0.add(unwrapPortable(obj, keepPortable, cpy));
+            col0.add(unwrapBinary(obj, keepBinary, cpy));
 
         return col0;
     }
 
     /**
-     * Unwrap array of portables if needed.
+     * Unwrap array of binaries if needed.
      *
      * @param arr Array.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @param cpy Copy.
      * @return Result.
      */
-    public Object[] unwrapPortablesInArrayIfNeeded(Object[] arr, boolean keepPortable, boolean cpy) {
+    public Object[] unwrapBinariesInArrayIfNeeded(Object[] arr, boolean keepBinary, boolean cpy) {
         Object[] res = new Object[arr.length];
 
         for (int i = 0; i < arr.length; i++)
-            res[i] = unwrapPortable(arr[i], keepPortable, cpy);
+            res[i] = unwrapBinary(arr[i], keepBinary, cpy);
 
         return res;
     }
@@ -196,17 +196,17 @@ public Object[] unwrapPortablesInArrayIfNeeded(Object[] arr, boolean keepPortabl
      * Unwraps map.
      *
      * @param map Map to unwrap.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Unwrapped collection.
      */
-    private Map unwrapPortablesIfNeeded(Map map, boolean keepPortable, boolean cpy) {
-        if (keepPortable)
+    private Map unwrapBinariesIfNeeded(Map map, boolean keepBinary, boolean cpy) {
+        if (keepBinary)
             return map;
 
         Map map0 = BinaryUtils.newMap(map);
 
         for (Map.Entry e : map.entrySet())
-            map0.put(unwrapPortable(e.getKey(), keepPortable, cpy), unwrapPortable(e.getValue(), keepPortable, cpy));
+            map0.put(unwrapBinary(e.getKey(), keepBinary, cpy), unwrapBinary(e.getValue(), keepBinary, cpy));
 
         return map0;
     }
@@ -217,7 +217,7 @@ private Map unwrapPortablesIfNeeded(Map map, boo
      * @param col List to unwrap.
      * @return Unwrapped list.
      */
-    private Collection unwrapPortables(ArrayList col, boolean keepPortable, boolean cpy) {
+    private Collection unwrapBinaries(ArrayList col, boolean keepBinary, boolean cpy) {
         int size = col.size();
 
         col = new ArrayList<>(col);
@@ -225,7 +225,7 @@ private Collection unwrapPortables(ArrayList col, boolean keepPo
         for (int i = 0; i < size; i++) {
             Object o = col.get(i);
 
-            Object unwrapped = unwrapPortable(o, keepPortable, cpy);
+            Object unwrapped = unwrapBinary(o, keepBinary, cpy);
 
             if (o != unwrapped)
                 col.set(i, unwrapped);
@@ -240,11 +240,11 @@ private Collection unwrapPortables(ArrayList col, boolean keepPo
      * @param set Set to unwrap.
      * @return Unwrapped set.
      */
-    private Set unwrapPortables(Set set, boolean keepPortable, boolean cpy) {
+    private Set unwrapBinaries(Set set, boolean keepBinary, boolean cpy) {
         Set set0 = BinaryUtils.newSet(set);
 
         for (Object obj : set)
-            set0.add(unwrapPortable(obj, keepPortable, cpy));
+            set0.add(unwrapBinary(obj, keepBinary, cpy));
 
         return set0;
     }
@@ -253,31 +253,31 @@ private Set unwrapPortables(Set set, boolean keepPortable, boole
      * @param o Object to unwrap.
      * @return Unwrapped object.
      */
-    private Object unwrapPortable(Object o, boolean keepPortable, boolean cpy) {
+    private Object unwrapBinary(Object o, boolean keepBinary, boolean cpy) {
         if (o instanceof Map.Entry) {
             Map.Entry entry = (Map.Entry)o;
 
             Object key = entry.getKey();
 
-            Object uKey = unwrapPortable(key, keepPortable, cpy);
+            Object uKey = unwrapBinary(key, keepBinary, cpy);
 
             Object val = entry.getValue();
 
-            Object uVal = unwrapPortable(val, keepPortable, cpy);
+            Object uVal = unwrapBinary(val, keepBinary, cpy);
 
             return (key != uKey || val != uVal) ? F.t(uKey, uVal) : o;
         }
         else if (o instanceof Collection)
-            return unwrapPortablesIfNeeded((Collection)o, keepPortable, cpy);
+            return unwrapBinariesIfNeeded((Collection)o, keepBinary, cpy);
         else if (o instanceof Map)
-            return unwrapPortablesIfNeeded((Map)o, keepPortable, cpy);
+            return unwrapBinariesIfNeeded((Map)o, keepBinary, cpy);
         else if (o instanceof Object[])
-            return unwrapPortablesInArrayIfNeeded((Object[])o, keepPortable, cpy);
+            return unwrapBinariesInArrayIfNeeded((Object[])o, keepBinary, cpy);
         else if (o instanceof CacheObject) {
             CacheObject co = (CacheObject)o;
 
-            if (!keepPortable || co.isPlatformType())
-                return unwrapPortable(co.value(this, cpy), keepPortable, cpy);
+            if (!keepBinary || co.isPlatformType())
+                return unwrapBinary(co.value(this, cpy), keepBinary, cpy);
         }
 
         return o;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
index 3993146ccb747..21934d06cce46 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
@@ -42,7 +42,7 @@ public class CacheOperationContext implements Serializable {
     /** Client ID which operates over this projection. */
     private final UUID subjId;
 
-    /** Keep portable flag. */
+    /** Keep binary flag. */
     private final boolean keepBinary;
 
     /** Expiry policy. */
@@ -66,7 +66,7 @@ public CacheOperationContext() {
     /**
      * @param skipStore Skip store flag.
      * @param subjId Subject ID.
-     * @param keepBinary Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @param expiryPlc Expiry policy.
      */
     public CacheOperationContext(
@@ -87,16 +87,16 @@ public CacheOperationContext(
     }
 
     /**
-     * @return Keep portable flag.
+     * @return Keep binary flag.
      */
     public boolean isKeepBinary() {
         return keepBinary;
     }
 
     /**
-     * See {@link IgniteInternalCache#keepPortable()}.
+     * See {@link IgniteInternalCache#keepBinary()}.
      *
-     * @return New instance of CacheOperationContext with keep portable flag.
+     * @return New instance of CacheOperationContext with keep binary flag.
      */
     public CacheOperationContext keepBinary() {
         return new CacheOperationContext(
@@ -200,4 +200,4 @@ public boolean noRetries() {
     @Override public String toString() {
         return S.toString(CacheOperationContext.class, this);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 034640f7699f7..ea57cafc8283e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -468,7 +468,7 @@ public boolean isDht() {
     }
 
     /** {@inheritDoc} */
-    @Override public  GridCacheProxyImpl keepPortable() {
+    @Override public  GridCacheProxyImpl keepBinary() {
         CacheOperationContext opCtx = new CacheOperationContext(false, null, true, null, false);
 
         return new GridCacheProxyImpl<>((GridCacheContext)ctx, (GridCacheAdapter)this, opCtx);
@@ -608,7 +608,7 @@ public void onKernalStop() {
             /*skip tx*/false,
             /*subj id*/null,
             /*task name*/null,
-            /*deserialize portable*/false,
+            /*deserialize binary*/false,
             /*skip values*/true,
             /*can remap*/true
         );
@@ -634,7 +634,7 @@ public void onKernalStop() {
             /*skip tx*/false,
             /*subj id*/null,
             /*task name*/null,
-            /*deserialize portable*/false,
+            /*deserialize binary*/false,
             /*skip values*/true,
             /*can remap*/true
         ).chain(new CX1>, Boolean>() {
@@ -669,7 +669,7 @@ public void onKernalStop() {
             modes.backup = true;
 
             if (modes.heap)
-                its.add(iterator(map.entries0().iterator(), !ctx.keepPortable()));
+                its.add(iterator(map.entries0().iterator(), !ctx.keepBinary()));
         }
         else if (modes.heap) {
             if (modes.near && ctx.isNear())
@@ -799,7 +799,7 @@ public String toString() {
             else
                 cacheVal = localCachePeek0(cacheKey, modes.heap, modes.offheap, modes.swap, plc);
 
-            Object val = ctx.unwrapPortableIfNeeded(cacheVal, ctx.keepPortable(), false);
+            Object val = ctx.unwrapBinaryIfNeeded(cacheVal, ctx.keepBinary(), false);
 
             return (V)val;
         }
@@ -1353,7 +1353,7 @@ public V getTopologySafe(K key) throws IgniteCheckedException {
             /*skip tx*/true,
             null,
             taskName,
-            !ctx.keepPortable(),
+            !ctx.keepBinary(),
             /*skip values*/false,
             /*can remap*/true);
     }
@@ -1375,7 +1375,7 @@ public V getTopologySafe(K key) throws IgniteCheckedException {
 
         long start = statsEnabled ? System.nanoTime() : 0L;
 
-        V val = get(key, !ctx.keepPortable());
+        V val = get(key, !ctx.keepBinary());
 
         if (ctx.config().getInterceptor() != null)
             val = (V)ctx.config().getInterceptor().onGet(key, val);
@@ -1394,7 +1394,7 @@ public V getTopologySafe(K key) throws IgniteCheckedException {
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
 
-        IgniteInternalFuture fut = getAsync(key, !ctx.keepPortable());
+        IgniteInternalFuture fut = getAsync(key, !ctx.keepBinary());
 
         if (ctx.config().getInterceptor() != null)
             fut =  fut.chain(new CX1, V>() {
@@ -1417,7 +1417,7 @@ public V getTopologySafe(K key) throws IgniteCheckedException {
 
         long start = statsEnabled ? System.nanoTime() : 0L;
 
-        Map map = getAll(keys, !ctx.keepPortable());
+        Map map = getAll(keys, !ctx.keepBinary());
 
         if (ctx.config().getInterceptor() != null)
             map = interceptGet(keys, map);
@@ -1436,7 +1436,7 @@ public V getTopologySafe(K key) throws IgniteCheckedException {
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
 
-        IgniteInternalFuture> fut = getAllAsync(keys, !ctx.keepPortable());
+        IgniteInternalFuture> fut = getAllAsync(keys, !ctx.keepBinary());
 
         if (ctx.config().getInterceptor() != null)
             return fut.chain(new CX1>, Map>() {
@@ -1498,7 +1498,7 @@ private Map interceptGet(@Nullable Collection keys, Map
      * @param skipTx Skip tx.
      * @param subjId Subj Id.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable.
+     * @param deserializeBinary Deserialize binary.
      * @param skipVals Skip values.
      * @param canRemap Can remap flag.
      * @return Future for the get operation.
@@ -1509,7 +1509,7 @@ protected IgniteInternalFuture getAsync(
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         final boolean skipVals,
         boolean canRemap
     ) {
@@ -1518,7 +1518,7 @@ protected IgniteInternalFuture getAsync(
             skipTx,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             skipVals,
             canRemap).chain(
             new CX1>, V>() {
@@ -1544,7 +1544,7 @@ protected IgniteInternalFuture getAsync(
      * @param skipTx Skip tx.
      * @param subjId Subj Id.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable.
+     * @param deserializeBinary Deserialize binary.
      * @param skipVals Skip values.
      * @param canRemap Can remap flag.
      * @return Future for the get operation.
@@ -1556,7 +1556,7 @@ protected IgniteInternalFuture> getAllAsync(
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         boolean skipVals,
         boolean canRemap
     ) {
@@ -1569,7 +1569,7 @@ protected IgniteInternalFuture> getAllAsync(
             !skipTx,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             forcePrimary,
             skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null),
             skipVals,
@@ -1582,7 +1582,7 @@ protected IgniteInternalFuture> getAllAsync(
      * @param checkTx Check tx.
      * @param subjId Subj Id.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable.
+     * @param deserializeBinary Deserialize binary.
      * @param forcePrimary Froce primary.
      * @param expiry Expiry policy.
      * @param skipVals Skip values.
@@ -1595,7 +1595,7 @@ public final IgniteInternalFuture> getAllAsync(@Nullable final Collect
         boolean checkTx,
         @Nullable final UUID subjId,
         final String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean forcePrimary,
         @Nullable IgniteCacheExpiryPolicy expiry,
         final boolean skipVals,
@@ -1611,7 +1611,7 @@ public final IgniteInternalFuture> getAllAsync(@Nullable final Collect
             checkTx,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiry,
             skipVals,
             false,
@@ -1625,7 +1625,7 @@ public final IgniteInternalFuture> getAllAsync(@Nullable final Collect
      * @param checkTx Check local transaction flag.
      * @param subjId Subject ID.
      * @param taskName Task name/
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiry Expiry policy.
      * @param skipVals Skip values flag.
      * @param keepCacheObjects Keep cache objects.
@@ -1638,7 +1638,7 @@ public final  IgniteInternalFuture> getAllAsync0(@Nullable f
         boolean checkTx,
         @Nullable final UUID subjId,
         final String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiry,
         final boolean skipVals,
         final boolean keepCacheObjects,
@@ -1696,7 +1696,7 @@ public final  IgniteInternalFuture> getAllAsync0(@Nullable f
                                 null,
                                 taskName,
                                 expiry,
-                                !deserializePortable);
+                                !deserializeBinary);
 
                             if (res == null) {
                                 if (storeEnabled) {
@@ -1722,7 +1722,7 @@ public final  IgniteInternalFuture> getAllAsync0(@Nullable f
                                         res.get1(),
                                         skipVals,
                                         keepCacheObjects,
-                                        deserializePortable,
+                                        deserializeBinary,
                                         true);
                                 }
 
@@ -1797,7 +1797,7 @@ public final  IgniteInternalFuture> getAllAsync0(@Nullable f
                                                             cacheVal,
                                                             skipVals,
                                                             keepCacheObjects,
-                                                            deserializePortable,
+                                                            deserializeBinary,
                                                             false);
                                                     }
                                                 }
@@ -1896,7 +1896,7 @@ public final  IgniteInternalFuture> getAllAsync0(@Nullable f
 
             return asyncOp(tx, new AsyncOp>(keys) {
                 @Override public IgniteInternalFuture> op(IgniteTxLocalAdapter tx) {
-                    return tx.getAllAsync(ctx, keys, deserializePortable, skipVals, false, !readThrough);
+                    return tx.getAllAsync(ctx, keys, deserializeBinary, skipVals, false, !readThrough);
                 }
             }, ctx.operationContextPerCall());
         }
@@ -3815,7 +3815,7 @@ public Iterator> igniteIterator() {
         if (!ctx0.isSwapOrOffheapEnabled() && ctx0.kernalContext().discovery().size() == 1)
             return localIteratorHonorExpirePolicy(opCtx);
 
-        CacheQueryFuture> fut = ctx0.queries().createScanQuery(null, null, ctx.keepPortable())
+        CacheQueryFuture> fut = ctx0.queries().createScanQuery(null, null, ctx.keepBinary())
             .keepAll(false)
             .execute();
 
@@ -3842,12 +3842,12 @@ public Iterator> igniteIterator() {
 
     /**
      * @param key Key.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Value.
      * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings("IfMayBeConditional")
-    @Nullable public V promote(K key, boolean deserializePortable) throws IgniteCheckedException {
+    @Nullable public V promote(K key, boolean deserializeBinary) throws IgniteCheckedException {
         A.notNull(key, "key");
 
         if (keyCheck)
@@ -3877,7 +3877,7 @@ public Iterator> igniteIterator() {
 
         Object val0 = val != null ? val.value(ctx.cacheObjectContext(), true) : null;
 
-        return (V)ctx.unwrapPortableIfNeeded(val0, !deserializePortable);
+        return (V)ctx.unwrapBinaryIfNeeded(val0, !deserializeBinary);
     }
 
     /** {@inheritDoc} */
@@ -4513,21 +4513,21 @@ public Set primaryKeySet(@Nullable CacheEntryPredicate... filter) {
 
     /**
      * @param key Key.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Cached value.
      * @throws IgniteCheckedException If failed.
      */
-    @Nullable public V get(K key, boolean deserializePortable)
+    @Nullable public V get(K key, boolean deserializeBinary)
         throws IgniteCheckedException {
-        return getAsync(key, deserializePortable).get();
+        return getAsync(key, deserializeBinary).get();
     }
 
     /**
      * @param key Key.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Read operation future.
      */
-    public final IgniteInternalFuture getAsync(final K key, boolean deserializePortable) {
+    public final IgniteInternalFuture getAsync(final K key, boolean deserializeBinary) {
         try {
             checkJta();
         }
@@ -4542,30 +4542,30 @@ public final IgniteInternalFuture getAsync(final K key, boolean deserializePo
             /*skip tx*/false,
             null,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             false,
             /*can remap*/true);
     }
 
     /**
      * @param keys Keys.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Map of cached values.
      * @throws IgniteCheckedException If read failed.
      */
-    public Map getAll(Collection keys, boolean deserializePortable) throws IgniteCheckedException {
+    public Map getAll(Collection keys, boolean deserializeBinary) throws IgniteCheckedException {
         checkJta();
 
-        return getAllAsync(keys, deserializePortable).get();
+        return getAllAsync(keys, deserializeBinary).get();
     }
 
     /**
      * @param keys Keys.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Read future.
      */
     public IgniteInternalFuture> getAllAsync(@Nullable Collection keys,
-        boolean deserializePortable) {
+        boolean deserializeBinary) {
         String taskName = ctx.kernalContext().job().currentTaskName();
 
         return getAllAsync(keys,
@@ -4573,7 +4573,7 @@ public IgniteInternalFuture> getAllAsync(@Nullable Collection keys) {
 
     /**
      * @param it Internal entry iterator.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Public API iterator.
      */
     protected Iterator> iterator(final Iterator it,
-        final boolean deserializePortable) {
+        final boolean deserializeBinary) {
         return new Iterator>() {
             {
                 advance();
@@ -4704,7 +4704,7 @@ private void advance() {
                     GridCacheEntryEx entry = it.next();
 
                     try {
-                        next = toCacheEntry(entry, deserializePortable);
+                        next = toCacheEntry(entry, deserializeBinary);
 
                         if (next == null)
                             continue;
@@ -4724,13 +4724,13 @@ private void advance() {
 
     /**
      * @param entry Internal entry.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @return Public API entry.
      * @throws IgniteCheckedException If failed.
      * @throws GridCacheEntryRemovedException If entry removed.
      */
     @Nullable private Cache.Entry toCacheEntry(GridCacheEntryEx entry,
-        boolean deserializePortable)
+        boolean deserializeBinary)
         throws IgniteCheckedException, GridCacheEntryRemovedException
     {
         CacheObject val = entry.innerGet(
@@ -4746,7 +4746,7 @@ private void advance() {
             null,
             null,
             null,
-            !deserializePortable);
+            !deserializeBinary);
 
         if (val == null)
             return null;
@@ -4756,9 +4756,9 @@ private void advance() {
         Object key0 = key.value(ctx.cacheObjectContext(), true);
         Object val0 = val.value(ctx.cacheObjectContext(), true);
 
-        if (deserializePortable) {
-            key0 = ctx.unwrapPortableIfNeeded(key0, true);
-            val0 = ctx.unwrapPortableIfNeeded(val0, true);
+        if (deserializeBinary) {
+            key0 = ctx.unwrapBinaryIfNeeded(key0, true);
+            val0 = ctx.unwrapBinaryIfNeeded(val0, true);
         }
 
         return new CacheEntryImpl<>((K)key0, (V)val0, entry.version());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index f78a606b2a844..05ff71a216c99 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1781,7 +1781,7 @@ private KeyIterator(GridCacheConcurrentMap map, boolean keepBinary, CacheEntryPr
 
         /** {@inheritDoc} */
         @Override public K next() {
-            return (K)it.ctx.cacheObjectContext().unwrapPortableIfNeeded(it.next().key(), keepBinary, true);
+            return (K)it.ctx.cacheObjectContext().unwrapBinaryIfNeeded(it.next().key(), keepBinary, true);
         }
 
         /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 6645d8ad81799..c10ebf3b399cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -320,7 +320,7 @@ public GridCacheContext(
         this.cacheType = cacheType;
         this.affNode = affNode;
         this.updatesAllowed = updatesAllowed;
-        this.depEnabled = ctx.deploy().enabled() && !cacheObjects().isPortableEnabled(cacheCfg);
+        this.depEnabled = ctx.deploy().enabled() && !cacheObjects().isBinaryEnabled(cacheCfg);
 
         /*
          * Managers in starting order!
@@ -1677,7 +1677,7 @@ public boolean cancelRemove(@Nullable IgniteBiTuple interceptorRes)
     }
 
     /**
-     * @return Portable processor.
+     * @return Binary processor.
      */
     public IgniteCacheObjectProcessor cacheObjects() {
         return kernalContext().cacheObjects();
@@ -1691,9 +1691,9 @@ public boolean binaryMarshaller() {
     }
 
     /**
-     * @return Keep portable flag.
+     * @return Keep binary flag.
      */
-    public boolean keepPortable() {
+    public boolean keepBinary() {
         CacheOperationContext opCtx = operationContextPerCall();
 
         return opCtx != null && opCtx.isKeepBinary();
@@ -1730,34 +1730,34 @@ public boolean useOffheapEntry() {
      * Unwraps collection.
      *
      * @param col Collection to unwrap.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Unwrapped collection.
      */
-    public Collection unwrapPortablesIfNeeded(Collection col, boolean keepPortable) {
-        return cacheObjCtx.unwrapPortablesIfNeeded(col, keepPortable);
+    public Collection unwrapBinariesIfNeeded(Collection col, boolean keepBinary) {
+        return cacheObjCtx.unwrapBinariesIfNeeded(col, keepBinary);
     }
 
     /**
      * Unwraps object for binary.
      *
      * @param o Object to unwrap.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Unwrapped object.
      */
-    public Object unwrapPortableIfNeeded(Object o, boolean keepPortable) {
-        return cacheObjCtx.unwrapPortableIfNeeded(o, keepPortable);
+    public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary) {
+        return cacheObjCtx.unwrapBinaryIfNeeded(o, keepBinary);
     }
 
     /**
      * Unwraps object for binary.
      *
      * @param o Object to unwrap.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @param cpy Copy value flag.
      * @return Unwrapped object.
      */
-    public Object unwrapPortableIfNeeded(Object o, boolean keepPortable, boolean cpy) {
-        return cacheObjCtx.unwrapPortableIfNeeded(o, keepPortable, cpy);
+    public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary, boolean cpy) {
+        return cacheObjCtx.unwrapBinaryIfNeeded(o, keepBinary, cpy);
     }
 
     /**
@@ -1772,7 +1772,7 @@ public Map unwrapInvokeResult(@Nullable Map resMap
                     CacheInvokeResult invokeRes = (CacheInvokeResult)res;
 
                     if (invokeRes.result() != null)
-                        res = CacheInvokeResult.fromResult(unwrapPortableIfNeeded(invokeRes.result(),
+                        res = CacheInvokeResult.fromResult(unwrapBinaryIfNeeded(invokeRes.result(),
                             keepBinary, false));
                 }
 
@@ -1872,7 +1872,7 @@ public CacheObject fromOffheap(long valPtr, boolean tmp) throws IgniteCheckedExc
      * @param val Value.
      * @param skipVals Skip values flag.
      * @param keepCacheObjects Keep cache objects flag.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param cpy Copy flag.
      */
     @SuppressWarnings("unchecked")
@@ -1881,15 +1881,15 @@ public  void addResult(Map map,
         CacheObject val,
         boolean skipVals,
         boolean keepCacheObjects,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         boolean cpy) {
         assert key != null;
         assert val != null || skipVals;
 
         if (!keepCacheObjects) {
-            Object key0 = unwrapPortableIfNeeded(key, !deserializePortable);
+            Object key0 = unwrapBinaryIfNeeded(key, !deserializeBinary);
 
-            Object val0 = skipVals ? true : unwrapPortableIfNeeded(val, !deserializePortable);
+            Object val0 = skipVals ? true : unwrapBinaryIfNeeded(val, !deserializeBinary);
 
             assert key0 != null : key;
             assert val0 != null : val;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index a0c9c3caf9259..ccbaf38ad332e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -378,7 +378,7 @@ public GridCacheUpdateTxResult innerSet(
         long ttl,
         boolean evt,
         boolean metrics,
-        boolean keepPortable,
+        boolean keepBinary,
         AffinityTopologyVersion topVer,
         CacheEntryPredicate[] filter,
         GridDrType drType,
@@ -416,7 +416,7 @@ public GridCacheUpdateTxResult innerRemove(
         boolean retval,
         boolean evt,
         boolean metrics,
-        boolean keepPortable,
+        boolean keepBinary,
         AffinityTopologyVersion topVer,
         CacheEntryPredicate[] filter,
         GridDrType drType,
@@ -472,7 +472,7 @@ public GridCacheUpdateAtomicResult innerUpdate(
         boolean writeThrough,
         boolean readThrough,
         boolean retval,
-        boolean keepPortable,
+        boolean keepBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean evt,
         boolean metrics,
@@ -521,7 +521,7 @@ public GridTuple3> innerUpdateLoca
         boolean writeThrough,
         boolean readThrough,
         boolean retval,
-        boolean keepPortable,
+        boolean keepBinary,
         @Nullable ExpiryPolicy expiryPlc,
         boolean evt,
         boolean metrics,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
index 98579c27e5ac3..ec8b8cc453e7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
@@ -154,7 +154,7 @@ public void addEvent(int part,
         UUID subjId,
         String cloClsName,
         String taskName,
-        boolean keepPortable)
+        boolean keepBinary)
     {
         addEvent(part,
             key,
@@ -168,7 +168,7 @@ public void addEvent(int part,
             subjId,
             cloClsName,
             taskName,
-            keepPortable);
+            keepBinary);
     }
 
     /**
@@ -246,7 +246,7 @@ public void addEvent(
         UUID subjId,
         @Nullable String cloClsName,
         @Nullable String taskName,
-        boolean keepPortable
+        boolean keepBinary
     ) {
         assert key != null || type == EVT_CACHE_STARTED || type == EVT_CACHE_STOPPED;
 
@@ -265,19 +265,19 @@ public void addEvent(
                     "(try to increase topology history size configuration property of configured " +
                     "discovery SPI): " + evtNodeId);
 
-            keepPortable = keepPortable || forceKeepBinary;
+            keepBinary = keepBinary || forceKeepBinary;
 
             Object key0;
             Object val0;
             Object oldVal0;
 
             try {
-                key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepPortable, false);
-                val0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, keepPortable, false);
-                oldVal0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, keepPortable, false);
+                key0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false);
+                val0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(newVal, keepBinary, false);
+                oldVal0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(oldVal, keepBinary, false);
             }
             catch (Exception e) {
-                if (!cctx.cacheObjectContext().processor().isPortableEnabled(cctx.config()))
+                if (!cctx.cacheObjectContext().processor().isBinaryEnabled(cctx.config()))
                     throw e;
 
                 if (log.isDebugEnabled())
@@ -289,9 +289,9 @@ public void addEvent(
 
                 forceKeepBinary = true;
 
-                key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, true, false);
-                val0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, true, false);
-                oldVal0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, true, false);
+                key0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, true, false);
+                val0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(newVal, true, false);
+                oldVal0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(oldVal, true, false);
             }
 
             cctx.gridEvents().record(new CacheEvent(cctx.name(),
@@ -387,4 +387,4 @@ public boolean isRecordable(int type) {
         X.println(">>> Cache event manager memory stats [grid=" + cctx.gridName() + ", cache=" + cctx.name() +
             ", stats=" + "N/A" + ']');
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index ae0b4123709de..c896a82e229fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1069,7 +1069,7 @@ protected void recordNodeId(UUID nodeId, AffinityTopologyVersion topVer) {
         long ttl,
         boolean evt,
         boolean metrics,
-        boolean keepPortable,
+        boolean keepBinary,
         AffinityTopologyVersion topVer,
         CacheEntryPredicate[] filter,
         GridDrType drType,
@@ -1127,10 +1127,10 @@ protected void recordNodeId(UUID nodeId, AffinityTopologyVersion topVer) {
             if (intercept) {
                 val0 = CU.value(val, cctx, false);
 
-                CacheLazyEntry e = new CacheLazyEntry(cctx, key, old, keepPortable);
+                CacheLazyEntry e = new CacheLazyEntry(cctx, key, old, keepBinary);
 
                 Object interceptorVal = cctx.config().getInterceptor().onBeforePut(
-                    new CacheLazyEntry(cctx, key, old, keepPortable),
+                    new CacheLazyEntry(cctx, key, old, keepBinary),
                     val0);
 
                 key0 = e.key();
@@ -1203,7 +1203,7 @@ else if (interceptorVal != val0)
                     evtOld,
                     evtOld != null || hasValueUnlocked(),
                     subjId, null, taskName,
-                    keepPortable);
+                    keepBinary);
             }
 
             if (cctx.isLocal() || cctx.isReplicated() ||
@@ -1211,7 +1211,7 @@ else if (interceptorVal != val0)
                 cctx.continuousQueries().onEntryUpdated(key, val, old, isInternal() || !context().userCache(),
                     partition(), tx.local(), false, updateCntr0, topVer);
 
-            cctx.dataStructures().onEntryUpdated(key, false, keepPortable);
+            cctx.dataStructures().onEntryUpdated(key, false, keepBinary);
         }
 
         if (log.isDebugEnabled())
@@ -1223,7 +1223,7 @@ else if (interceptorVal != val0)
             cctx.store().put(tx, keyValue(false), CU.value(val, cctx, false), newVer);
 
         if (intercept)
-            cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, val, val0, keepPortable));
+            cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, val, val0, keepBinary));
 
         return valid ? new GridCacheUpdateTxResult(true, retval ? old : null, updateCntr0) :
             new GridCacheUpdateTxResult(false, null);
@@ -1245,7 +1245,7 @@ protected Object keyValue(boolean cpy) {
         boolean retval,
         boolean evt,
         boolean metrics,
-        boolean keepPortable,
+        boolean keepBinary,
         AffinityTopologyVersion topVer,
         CacheEntryPredicate[] filter,
         GridDrType drType,
@@ -1307,7 +1307,7 @@ protected Object keyValue(boolean cpy) {
             old = (retval || intercept) ? rawGetOrUnmarshalUnlocked(!retval) : val;
 
             if (intercept) {
-                entry0 = new CacheLazyEntry(cctx, key, old, keepPortable);
+                entry0 = new CacheLazyEntry(cctx, key, old, keepBinary);
 
                 interceptRes = cctx.config().getInterceptor().onBeforeRemove(entry0);
 
@@ -1385,7 +1385,7 @@ else if (log.isDebugEnabled())
                     subjId,
                     null,
                     taskName,
-                    keepPortable);
+                    keepBinary);
             }
 
             if (cctx.isLocal() || cctx.isReplicated() ||
@@ -1393,7 +1393,7 @@ else if (log.isDebugEnabled())
                 cctx.continuousQueries().onEntryUpdated(key, null, old, isInternal()
                     || !context().userCache(),partition(), tx.local(), false, updateCntr0, topVer);
 
-            cctx.dataStructures().onEntryUpdated(key, true, keepPortable);
+            cctx.dataStructures().onEntryUpdated(key, true, keepBinary);
 
             deferred = cctx.deferredDelete() && !detached() && !isInternal();
 
@@ -1534,7 +1534,7 @@ else if (ttl == CU.TTL_NOT_CHANGED)
                         updateTtl(expiryPlc);
 
                     Object val = retval ?
-                        cctx.cacheObjectContext().unwrapPortableIfNeeded(CU.value(old, cctx, false), keepBinary, false)
+                        cctx.cacheObjectContext().unwrapBinaryIfNeeded(CU.value(old, cctx, false), keepBinary, false)
                         : null;
 
                     return new T3<>(false, val, null);
@@ -1751,7 +1751,7 @@ else if (ttl != CU.TTL_ZERO)
         return new GridTuple3<>(res,
             cctx.unwrapTemporary(interceptorRes != null ?
                 interceptorRes.get2() :
-                cctx.cacheObjectContext().unwrapPortableIfNeeded(old, keepBinary, false)),
+                cctx.cacheObjectContext().unwrapBinaryIfNeeded(old, keepBinary, false)),
             invokeRes);
     }
 
@@ -1767,7 +1767,7 @@ else if (ttl != CU.TTL_ZERO)
         boolean writeThrough,
         boolean readThrough,
         boolean retval,
-        boolean keepPortable,
+        boolean keepBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean evt,
         boolean metrics,
@@ -1839,7 +1839,7 @@ else if (ttl != CU.TTL_ZERO)
 
                         oldVal = rawGetOrUnmarshalUnlocked(true);
 
-                        CacheInvokeEntry entry = new CacheInvokeEntry(cctx, key, oldVal, version(), keepPortable);
+                        CacheInvokeEntry entry = new CacheInvokeEntry(cctx, key, oldVal, version(), keepBinary);
 
                         try {
                             Object computed = entryProcessor.process(entry, invokeArgs);
@@ -1977,7 +1977,7 @@ else if (ttl != CU.TTL_ZERO)
                                     (EntryProcessor)writeObj;
 
                                 CacheInvokeEntry entry =
-                                    new CacheInvokeEntry<>(cctx, key, prevVal, version(), keepPortable);
+                                    new CacheInvokeEntry<>(cctx, key, prevVal, version(), keepBinary);
 
                                 try {
                                     entryProcessor.process(entry, invokeArgs);
@@ -2099,7 +2099,7 @@ assert isNew() || ATOMIC_VER_COMPARATOR.compare(ver, newVer, ignoreTime) <= 0 :
 
                 EntryProcessor entryProcessor = (EntryProcessor)writeObj;
 
-                CacheInvokeEntry entry = new CacheInvokeEntry(cctx, key, oldVal, version(), keepPortable);
+                CacheInvokeEntry entry = new CacheInvokeEntry(cctx, key, oldVal, version(), keepBinary);
 
                 try {
                     Object computed = entryProcessor.process(entry, invokeArgs);
@@ -2224,7 +2224,7 @@ else if (newSysTtl == CU.TTL_ZERO) {
                     updated0 = value(updated0, updated, false);
 
                     Object interceptorVal = cctx.config().getInterceptor()
-                        .onBeforePut(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepPortable), updated0);
+                        .onBeforePut(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepBinary), updated0);
 
                     if (interceptorVal == null)
                         return new GridCacheUpdateAtomicResult(false,
@@ -2291,7 +2291,7 @@ assert deletedUnlocked() || new0 || isInternal(): "Invalid entry [entry=" + this
                         cctx.events().addEvent(partition(), key, evtNodeId, null,
                             newVer, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld,
                             evtOld != null || hadVal, subjId, transformClo.getClass().getName(), taskName,
-                            keepPortable);
+                            keepBinary);
                     }
 
                     if (newVer != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_PUT)) {
@@ -2300,14 +2300,14 @@ assert deletedUnlocked() || new0 || isInternal(): "Invalid entry [entry=" + this
 
                         cctx.events().addEvent(partition(), key, evtNodeId, null,
                             newVer, EVT_CACHE_OBJECT_PUT, updated, updated != null, evtOld,
-                            evtOld != null || hadVal, subjId, null, taskName, keepPortable);
+                            evtOld != null || hadVal, subjId, null, taskName, keepBinary);
                     }
                 }
             }
             else {
                 if (intercept) {
                     interceptRes = cctx.config().getInterceptor().onBeforeRemove(new CacheLazyEntry(cctx, key, key0,
-                        oldVal, old0, keepPortable));
+                        oldVal, old0, keepBinary));
 
                     if (cctx.cancelRemove(interceptRes))
                         return new GridCacheUpdateAtomicResult(false,
@@ -2387,7 +2387,7 @@ assert deletedUnlocked() || new0 || isInternal() : "Invalid entry [entry=" + thi
                         cctx.events().addEvent(partition(), key, evtNodeId, null,
                             newVer, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld,
                             evtOld != null || hadVal, subjId, transformClo.getClass().getName(), taskName,
-                            keepPortable);
+                            keepBinary);
                     }
 
                     if (newVer != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_REMOVED)) {
@@ -2396,7 +2396,7 @@ assert deletedUnlocked() || new0 || isInternal() : "Invalid entry [entry=" + thi
 
                         cctx.events().addEvent(partition(), key, evtNodeId, null, newVer,
                             EVT_CACHE_OBJECT_REMOVED, null, false, evtOld, evtOld != null || hadVal,
-                            subjId, null, taskName, keepPortable);
+                            subjId, null, taskName, keepBinary);
                     }
                 }
 
@@ -2406,13 +2406,13 @@ assert deletedUnlocked() || new0 || isInternal() : "Invalid entry [entry=" + thi
             if (res)
                 updateMetrics(op, metrics);
 
-            cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE, keepPortable);
+            cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE, keepBinary);
 
             if (intercept) {
                 if (op == GridCacheOperation.UPDATE)
-                    cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, updated, updated0, keepPortable));
+                    cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, updated, updated0, keepBinary));
                 else
-                    cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepPortable));
+                    cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepBinary));
 
                 if (interceptRes != null)
                     oldVal = cctx.toCacheObject(cctx.unwrapTemporary(interceptRes.get2()));
@@ -4330,13 +4330,13 @@ private LazyValueEntry(KeyCacheObject key, boolean keepBinary) {
 
         /** {@inheritDoc} */
         @Override public K getKey() {
-            return (K)cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepBinary);
+            return (K)cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary);
         }
 
         /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
         @Override public V getValue() {
-            return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(peekVisibleValue(), keepBinary);
+            return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(peekVisibleValue(), keepBinary);
         }
 
         /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
index f4ddf89797a3a..ea036af531569 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java
@@ -34,7 +34,7 @@
  *     
  • Expire time
    • 
  *     
  • GridCacheVersion or GridCacheVersionEx
    • 
  *     
  • Value is byte array flag
    • 
- *     
  • Value byte array (marshalled with portable or grid marshaller)
    • 
+ *     
  • Value byte array (marshalled with binary or grid marshaller)
    • 
  *     
  • Value classloader UUID
    • 
  *     
  • Key classloader UUID
    • 
  * 
@@ -192,4 +192,4 @@ public static GridCacheVersion version(long ptr) {
     @Override public String toString() {
         return S.toString(GridCacheOffheapSwapEntry.class, this);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 68e70c337ca3b..d1d93d8244879 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -229,7 +229,7 @@ public IgniteInternalCache delegate() {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public  GridCacheProxyImpl keepPortable() {
+    @Override public  GridCacheProxyImpl keepBinary() {
         if (opCtx != null && opCtx.isKeepBinary())
             return (GridCacheProxyImpl)this;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
index 2d179fa9a0d88..21154c9058d6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java
@@ -190,7 +190,7 @@ public GridCacheReturn set(
      */
     private void initValue(GridCacheContext cctx, @Nullable CacheObject cacheObj, boolean keepBinary) {
         if (loc)
-            v = cctx.cacheObjectContext().unwrapPortableIfNeeded(cacheObj, keepBinary, true);
+            v = cctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheObj, keepBinary, true);
         else {
             assert cacheId == 0 || cacheId == cctx.cacheId();
 
@@ -318,7 +318,7 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
         if (cacheObj != null) {
             cacheObj.finishUnmarshal(ctx.cacheObjectContext(), ldr);
 
-            v = ctx.cacheObjectContext().unwrapPortableIfNeeded(cacheObj, true, false);
+            v = ctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheObj, true, false);
         }
 
         if (invokeRes && invokeResCol != null) {
@@ -329,10 +329,10 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
 
             for (CacheInvokeDirectResult res : invokeResCol) {
                 CacheInvokeResult res0 = res.error() == null ?
-                    CacheInvokeResult.fromResult(ctx.cacheObjectContext().unwrapPortableIfNeeded(res.result(), true, false)) :
+                    CacheInvokeResult.fromResult(ctx.cacheObjectContext().unwrapBinaryIfNeeded(res.result(), true, false)) :
                     CacheInvokeResult.fromError(res.error());
 
-                map0.put(ctx.cacheObjectContext().unwrapPortableIfNeeded(res.key(), true, false), res0);
+                map0.put(ctx.cacheObjectContext().unwrapBinaryIfNeeded(res.key(), true, false), res0);
             }
 
             v = map0;
@@ -464,4 +464,4 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
     @Override public String toString() {
         return S.toString(GridCacheReturn.class, this);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 8fd43237fb377..1768ecff2d351 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -322,7 +322,7 @@ public GridCacheGateway gate() {
 
     /** {@inheritDoc} */
     @Override public  IgniteCache withKeepBinary() {
-        return keepPortable();
+        return keepBinary();
     }
 
     /** {@inheritDoc} */
@@ -455,13 +455,13 @@ private QueryCursor> query(final Query filter, @Nullable Cluste
         final CacheQuery> qry;
         final CacheQueryFuture> fut;
 
-        boolean isKeepPortable = opCtx != null && opCtx.isKeepBinary();
+        boolean isKeepBinary = opCtx != null && opCtx.isKeepBinary();
 
         if (filter instanceof ScanQuery) {
             IgniteBiPredicate p = ((ScanQuery)filter).getFilter();
 
             qry = ctx.queries().createScanQuery(p != null ? p : ACCEPT_ALL, ((ScanQuery)filter).getPartition(),
-                isKeepPortable);
+                isKeepBinary);
 
             if (grp != null)
                 qry.projection(grp);
@@ -476,7 +476,7 @@ private QueryCursor> query(final Query filter, @Nullable Cluste
         else if (filter instanceof TextQuery) {
             TextQuery p = (TextQuery)filter;
 
-            qry = ctx.queries().createFullTextQuery(p.getType(), p.getText(), isKeepPortable);
+            qry = ctx.queries().createFullTextQuery(p.getType(), p.getText(), isKeepBinary);
 
             if (grp != null)
                 qry.projection(grp);
@@ -489,7 +489,7 @@ else if (filter instanceof TextQuery) {
                 }, false);
         }
         else if (filter instanceof SpiQuery) {
-            qry = ctx.queries().createSpiQuery(isKeepPortable);
+            qry = ctx.queries().createSpiQuery(isKeepBinary);
 
             if (grp != null)
                 qry.projection(grp);
@@ -1718,30 +1718,30 @@ else if (clazz.isAssignableFrom(IgniteEx.class))
     }
 
     /**
-     * Creates projection that will operate with portable objects. 
     Projection returned by this method will force
-     * cache not to deserialize portable objects, so keys and values will be returned from cache API methods without
-     * changes. Therefore, signature of the projection can contain only following types: 
       
    • {@code PortableObject}
-     * for portable classes
      •  
    • All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)
      • 
+     * Creates projection that will operate with binary objects. 
       Projection returned by this method will force
+     * cache not to deserialize binary objects, so keys and values will be returned from cache API methods without
+     * changes. Therefore, signature of the projection can contain only following types: 
         
      • {@code BinaryObject}
+     * for binary classes
        •  
      • All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)
        • 
      * 
      • Arrays of primitives (byte[], int[], ...)
        •  
      • {@link String} and array of {@link String}s
        • 
      * 
      • {@link UUID} and array of {@link UUID}s
        •  
      • {@link Date} and array of {@link Date}s
        •  
      • {@link
      * java.sql.Timestamp} and array of {@link java.sql.Timestamp}s
        •  
      • Enums and array of enums
        •  
      •  Maps,
-     * collections and array of objects (but objects inside them will still be converted if they are portable) 
        • 
+     * collections and array of objects (but objects inside them will still be converted if they are binary) 
      * 
       
       For example, if you use {@link Integer} as a key and {@code Value} class as a value (which will be
-     * stored in portable format), you should acquire following projection to avoid deserialization:
+     * stored in binary format), you should acquire following projection to avoid deserialization:
      * 
      -     * IgniteInternalCache prj = cache.keepBinary();
+     * IgniteInternalCache prj = cache.keepBinary();
      *
-     * // Value is not deserialized and returned in portable format.
-     * GridPortableObject po = prj.get(1);
+     * // Value is not deserialized and returned in binary format.
+     * GridBinaryObject po = prj.get(1);
      * 
      
-     * 
       Note that this method makes sense only if cache is working in portable mode ({@code
-     * CacheConfiguration#isPortableEnabled()} returns {@code true}. If not, this method is no-op and will return
+     * 
       Note that this method makes sense only if cache is working in binary mode ({@code
+     * CacheConfiguration#isBinaryEnabled()} returns {@code true}. If not, this method is no-op and will return
      * current projection.
      *
-     * @return Projection for portable objects.
+     * @return Projection for binary objects.
      */
     @SuppressWarnings("unchecked")
-    public  IgniteCache keepPortable() {
+    public  IgniteCache keepBinary() {
         GridCacheGateway gate = this.gate;
 
         CacheOperationContext prev = onEnter(gate, opCtx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
index 3150ea99ffd54..186de6870c887 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
@@ -169,31 +169,31 @@
  * to any participating grid nodes. However, in case of redeployment, caches will be cleared and
  * all entries will be removed. This behavior is useful during development, but should not be
  * used in production.
- * 
      Portable Objects
      
- * If an object is defined as portable Ignite cache will automatically store it in portable (i.e. binary)
- * format. User can choose to work either with the portable format or with the deserialized form (assuming
+ * 
      Binary Objects
      
+ * If an object is defined as binary Ignite cache will automatically store it in binary (i.e. binary)
+ * format. User can choose to work either with the binary format or with the deserialized form (assuming
  * that class definitions are present in the classpath). By default, cache works with deserialized form
- * (example shows the case when {@link Integer} is used as a key for a portable object):
+ * (example shows the case when {@link Integer} is used as a key for a binary object):
  * 
        * IgniteInternalCache prj = Ignition.grid().cache(null);
  *
- * // Value will be serialized and stored in cache in portable format.
+ * // Value will be serialized and stored in cache in binary format.
  * prj.put(1, new Value());
  *
- * // Value will be deserialized since it's stored in portable format.
+ * // Value will be deserialized since it's stored in binary format.
  * Value val = prj.get(1);
  * 
      
  * You won't be able to work with deserialized form if class definition for the {@code Value} is not on
  * classpath. Even if you have the class definition, you should always avoid full deserialization if it's not
- * needed for performance reasons. To work with portable format directly you should create special projection
- * using {@link #keepPortable()} method:
+ * needed for performance reasons. To work with binary format directly you should create special projection
+ * using {@link #keepBinary()} method:
  * 
      - * IgniteInternalCache prj = Ignition.grid().cache(null).keepBinary();
+ * IgniteInternalCache prj = Ignition.grid().cache(null).keepBinary();
  *
- * // Value is not deserialized and returned in portable format.
- * GridPortableObject po = prj.get(1);
+ * // Value is not deserialized and returned in binary format.
+ * GridBinaryObject po = prj.get(1);
  * 
      
- * See {@link #keepPortable()} method JavaDoc for more details.
+ * See {@link #keepBinary()} method JavaDoc for more details.
  */
 public interface IgniteInternalCache extends Iterable> {
     /**
@@ -225,13 +225,13 @@ public interface IgniteInternalCache extends Iterable> {
     public IgniteInternalCache setSkipStore(boolean skipStore);
 
     /**
-     * Creates projection that will operate with portable objects.
+     * Creates projection that will operate with binary objects.
      * 
      
-     * Projection returned by this method will force cache not to deserialize portable objects,
+     * Projection returned by this method will force cache not to deserialize binary objects,
      * so keys and values will be returned from cache API methods without changes. Therefore,
      * signature of the projection can contain only following types:
      * 
        
-     *     
      • org.gridgain.grid.binary.PortableObject for portable classes
        • 
+     *     
      • org.gridgain.grid.binary.BinaryObject for binary classes
        • 
      *     
      • All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)
        • 
      *     
      • Arrays of primitives (byte[], int[], ...)
        • 
      *     
      • {@link String} and array of {@link String}s
        • 
@@ -241,27 +241,27 @@ public interface IgniteInternalCache extends Iterable> {
      *     
      • Enums and array of enums
        • 
      *     
      • 
      *         Maps, collections and array of objects (but objects inside
-     *         them will still be converted if they are portable)
+     *         them will still be converted if they are binary)
      *     
        • 
      * 
      
      * 
      
      * For example, if you use {@link Integer} as a key and {@code Value} class as a value
-     * (which will be stored in portable format), you should acquire following projection
+     * (which will be stored in binary format), you should acquire following projection
      * to avoid deserialization:
      * 
      -     * IgniteInternalCache prj = cache.keepBinary();
+     * IgniteInternalCache prj = cache.keepBinary();
      *
-     * // Value is not deserialized and returned in portable format.
-     * GridPortableObject po = prj.get(1);
+     * // Value is not deserialized and returned in binary format.
+     * GridBinaryObject po = prj.get(1);
      * 
      
      * 
      
-     * Note that this method makes sense only if cache is working in portable mode
-     * (org.apache.ignite.configuration.CacheConfiguration#isPortableEnabled() returns {@code true}. If not,
+     * Note that this method makes sense only if cache is working in binary mode
+     * (org.apache.ignite.configuration.CacheConfiguration#isBinaryEnabled() returns {@code true}. If not,
      * this method is no-op and will return current projection.
      *
-     * @return New internal cache instance for portable objects.
+     * @return New internal cache instance for binary objects.
      */
-    public  IgniteInternalCache keepPortable();
+    public  IgniteInternalCache keepBinary();
 
     /**
      * Returns {@code true} if this map contains no key-value mappings.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java
index f6204fbc670dc..1f2678b1e85bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java
@@ -25,7 +25,7 @@
 import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
- * Key for portable meta data.
+ * Key for binary meta data.
  */
 class BinaryMetadataKey extends GridCacheUtilityKey implements Externalizable {
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java
index c0a461280e35d..0ca06e3b2bc84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java
@@ -37,10 +37,10 @@ public class CacheDefaultBinaryAffinityKeyMapper extends GridCacheDefaultAffinit
         CacheObjectBinaryProcessorImpl proc = (CacheObjectBinaryProcessorImpl)kernal.context().cacheObjects();
 
         try {
-            key = proc.toPortable(key);
+            key = proc.toBinary(key);
         }
         catch (IgniteException e) {
-            U.error(log, "Failed to marshal key to portable: " + key, e);
+            U.error(log, "Failed to marshal key to binary: " + key, e);
         }
 
         if (key instanceof BinaryObject)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java
index 039f5ce33f280..ec01f48a8bf38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java
@@ -27,11 +27,11 @@
  */
 public class CacheObjectBinaryContext extends CacheObjectContext {
     /** */
-    private boolean portableEnabled;
+    private boolean binaryEnabled;
 
     /**
      * @param kernalCtx Kernal context.
-     * @param portableEnabled Portable enabled flag.
+     * @param binaryEnabled Binary enabled flag.
      * @param cpyOnGet Copy on get flag.
      * @param storeVal {@code True} if should store unmarshalled value in cache.
      * @param depEnabled {@code true} if deployment is enabled for the given cache.
@@ -39,18 +39,18 @@ public class CacheObjectBinaryContext extends CacheObjectContext {
     public CacheObjectBinaryContext(GridKernalContext kernalCtx,
         boolean cpyOnGet,
         boolean storeVal,
-        boolean portableEnabled,
+        boolean binaryEnabled,
         boolean depEnabled) {
-        super(kernalCtx, portableEnabled ? new CacheDefaultBinaryAffinityKeyMapper() :
+        super(kernalCtx, binaryEnabled ? new CacheDefaultBinaryAffinityKeyMapper() :
             new GridCacheDefaultAffinityKeyMapper(), cpyOnGet, storeVal, depEnabled);
 
-        this.portableEnabled = portableEnabled;
+        this.binaryEnabled = binaryEnabled;
     }
 
     /**
-     * @return Portable enabled flag.
+     * @return Binary enabled flag.
      */
-    public boolean portableEnabled() {
-        return portableEnabled;
+    public boolean binaryEnabled() {
+        return binaryEnabled;
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java
index d5638a5f753fb..3578f7a1010da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java
@@ -38,12 +38,12 @@ public interface CacheObjectBinaryProcessor extends IgniteCacheObjectProcessor {
     public BinaryObjectBuilder builder(String clsName);
 
     /**
-     * Creates builder initialized by existing portable object.
+     * Creates builder initialized by existing binary object.
      *
-     * @param portableObj Portable object to edit.
-     * @return Portable builder.
+     * @param binaryObj Binary object to edit.
+     * @return Binary builder.
      */
-    public BinaryObjectBuilder builder(BinaryObject portableObj);
+    public BinaryObjectBuilder builder(BinaryObject binaryObj);
 
     /**
      * @param typeId Type ID.
@@ -92,15 +92,15 @@ public void updateMetadata(int typeId, String typeName, @Nullable String affKeyF
     public BinaryObject buildEnum(String typeName, int ord) throws IgniteException;
 
     /**
-     * @return Portables interface.
+     * @return Binaries interface.
      * @throws IgniteException If failed.
      */
     public IgniteBinary binary() throws IgniteException;
 
     /**
      * @param obj Original object.
-     * @return Portable object (in case portable marshaller is used).
+     * @return Binary object (in case binary marshaller is used).
      * @throws IgniteException If failed.
      */
-    public Object marshalToPortable(Object obj) throws IgniteException;
+    public Object marshalToBinary(Object obj) throws IgniteException;
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index a9f0d74ec8697..e77b85a9fd4aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -98,7 +98,7 @@
 import sun.misc.Unsafe;
 
 /**
- * Portable processor implementation.
+ * Binary processor implementation.
  */
 public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorImpl implements
     CacheObjectBinaryProcessor {
@@ -117,7 +117,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm
     /** */
     private final ConcurrentHashMap8 clientMetaDataCache;
 
-    /** Predicate to filter portable meta data in utility cache. */
+    /** Predicate to filter binary meta data in utility cache. */
     private final CacheEntryPredicate metaPred = new CacheEntryPredicateAdapter() {
         private static final long serialVersionUID = 0L;
 
@@ -127,17 +127,17 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm
     };
 
     /** */
-    private BinaryContext portableCtx;
+    private BinaryContext binaryCtx;
 
     /** */
     private Marshaller marsh;
 
     /** */
-    private GridBinaryMarshaller portableMarsh;
+    private GridBinaryMarshaller binaryMarsh;
 
     /** */
     @GridToStringExclude
-    private IgniteBinary portables;
+    private IgniteBinary binaries;
 
     /** Metadata updates collected before metadata cache is initialized. */
     private final Map metaBuf = new ConcurrentHashMap<>();
@@ -193,7 +193,7 @@ public CacheObjectBinaryProcessorImpl(GridKernalContext ctx) {
 
                     assert metaDataCache != null;
 
-                    CacheObjectBinaryProcessorImpl.this.addMeta(typeId, newMeta0.wrap(portableCtx));
+                    CacheObjectBinaryProcessorImpl.this.addMeta(typeId, newMeta0.wrap(binaryCtx));
                 }
 
                 @Override public BinaryType metadata(int typeId) throws BinaryObjectException {
@@ -206,14 +206,14 @@ public CacheObjectBinaryProcessorImpl(GridKernalContext ctx) {
 
             BinaryMarshaller pMarh0 = (BinaryMarshaller)marsh;
 
-            portableCtx = new BinaryContext(metaHnd, ctx.config());
+            binaryCtx = new BinaryContext(metaHnd, ctx.config());
 
-            IgniteUtils.invoke(BinaryMarshaller.class, pMarh0, "setPortableContext", portableCtx,
+            IgniteUtils.invoke(BinaryMarshaller.class, pMarh0, "setBinaryContext", binaryCtx,
                 ctx.config());
 
-            portableMarsh = new GridBinaryMarshaller(portableCtx);
+            binaryMarsh = new GridBinaryMarshaller(binaryCtx);
 
-            portables = new IgniteBinaryImpl(ctx, this);
+            binaries = new IgniteBinaryImpl(ctx, this);
         }
     }
 
@@ -286,7 +286,7 @@ public CacheObjectBinaryProcessorImpl(GridKernalContext ctx) {
         }
 
         for (Map.Entry e : metaBuf.entrySet())
-            addMeta(e.getKey(), e.getValue().wrap(portableCtx));
+            addMeta(e.getKey(), e.getValue().wrap(binaryCtx));
 
         metaBuf.clear();
 
@@ -321,17 +321,17 @@ private void addClientCacheMetaData(BinaryMetadataKey key, final BinaryMetadata
                     res = oldMeta0;
                 }
 
-                return res != null ? res.wrap(portableCtx) : null;
+                return res != null ? res.wrap(binaryCtx) : null;
             }
         });
     }
 
     /** {@inheritDoc} */
     @Override public int typeId(String typeName) {
-        if (portableCtx == null)
+        if (binaryCtx == null)
             return super.typeId(typeName);
 
-        return portableCtx.typeId(typeName);
+        return binaryCtx.typeId(typeName);
     }
 
     /**
@@ -340,7 +340,7 @@ private void addClientCacheMetaData(BinaryMetadataKey key, final BinaryMetadata
      * @throws org.apache.ignite.binary.BinaryObjectException If failed.
      */
     public byte[] marshal(@Nullable Object obj) throws BinaryObjectException {
-        byte[] arr = portableMarsh.marshal(obj);
+        byte[] arr = binaryMarsh.marshal(obj);
 
         assert arr.length > 0;
 
@@ -367,7 +367,7 @@ public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectExceptio
 
             BinaryInputStream in = new BinaryOffheapInputStream(ptr, size, forceHeap);
 
-            return portableMarsh.unmarshal(in);
+            return binaryMarsh.unmarshal(in);
         }
         else
             return U.copyMemory(ptr, size);
@@ -375,11 +375,11 @@ public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectExceptio
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public Object marshalToPortable(@Nullable Object obj) throws BinaryObjectException {
+    @Override public Object marshalToBinary(@Nullable Object obj) throws BinaryObjectException {
         if (obj == null)
             return null;
 
-        if (BinaryUtils.isPortableType(obj.getClass()))
+        if (BinaryUtils.isBinaryType(obj.getClass()))
             return obj;
 
         if (obj instanceof Object[]) {
@@ -388,7 +388,7 @@ public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectExceptio
             Object[] pArr = new Object[arr.length];
 
             for (int i = 0; i < arr.length; i++)
-                pArr[i] = marshalToPortable(arr[i]);
+                pArr[i] = marshalToBinary(arr[i]);
 
             return pArr;
         }
@@ -397,9 +397,9 @@ public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectExceptio
             IgniteBiTuple tup = (IgniteBiTuple)obj;
 
             if (obj instanceof T2)
-                return new T2<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2()));
+                return new T2<>(marshalToBinary(tup.get1()), marshalToBinary(tup.get2()));
 
-            return new IgniteBiTuple<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2()));
+            return new IgniteBiTuple<>(marshalToBinary(tup.get1()), marshalToBinary(tup.get2()));
         }
 
         if (obj instanceof Collection) {
@@ -413,7 +413,7 @@ public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectExceptio
                 pCol = new ArrayList<>(col.size());
 
             for (Object item : col)
-                pCol.add(marshalToPortable(item));
+                pCol.add(marshalToBinary(item));
 
             return pCol;
         }
@@ -424,7 +424,7 @@ public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectExceptio
             Map pMap = BinaryUtils.newMap((Map)obj);
 
             for (Map.Entry e : map.entrySet())
-                pMap.put(marshalToPortable(e.getKey()), marshalToPortable(e.getValue()));
+                pMap.put(marshalToBinary(e.getKey()), marshalToBinary(e.getValue()));
 
             return pMap;
         }
@@ -432,14 +432,14 @@ public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectExceptio
         if (obj instanceof Map.Entry) {
             Map.Entry e = (Map.Entry)obj;
 
-            return new GridMapEntry<>(marshalToPortable(e.getKey()), marshalToPortable(e.getValue()));
+            return new GridMapEntry<>(marshalToBinary(e.getKey()), marshalToBinary(e.getValue()));
         }
 
-        byte[] arr = portableMarsh.marshal(obj);
+        byte[] arr = binaryMarsh.marshal(obj);
 
         assert arr.length > 0;
 
-        Object obj0 = portableMarsh.unmarshal(arr, null);
+        Object obj0 = binaryMarsh.unmarshal(arr, null);
 
         // Possible if a class has writeObject method.
         if (obj0 instanceof BinaryObject)
@@ -452,17 +452,17 @@ public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectExceptio
      * @return Marshaller.
      */
     public GridBinaryMarshaller marshaller() {
-        return portableMarsh;
+        return binaryMarsh;
     }
 
     /** {@inheritDoc} */
     @Override public BinaryObjectBuilder builder(String clsName) {
-        return new BinaryObjectBuilderImpl(portableCtx, clsName);
+        return new BinaryObjectBuilderImpl(binaryCtx, clsName);
     }
 
     /** {@inheritDoc} */
-    @Override public BinaryObjectBuilder builder(BinaryObject portableObj) {
-        return BinaryObjectBuilderImpl.wrap(portableObj);
+    @Override public BinaryObjectBuilder builder(BinaryObject binaryObj) {
+        return BinaryObjectBuilderImpl.wrap(binaryObj);
     }
 
     /** {@inheritDoc} */
@@ -470,7 +470,7 @@ public GridBinaryMarshaller marshaller() {
         Map fieldTypeIds, boolean isEnum) throws BinaryObjectException {
         BinaryMetadata meta = new BinaryMetadata(typeId, typeName, fieldTypeIds, affKeyFieldName, null, isEnum);
 
-        portableCtx.updateMetadata(typeId, meta);
+        binaryCtx.updateMetadata(typeId, meta);
     }
 
     /** {@inheritDoc} */
@@ -507,7 +507,7 @@ public GridBinaryMarshaller marshaller() {
 
                 BinaryMetadata meta = metaDataCache.getTopologySafe(new BinaryMetadataKey(typeId));
 
-                return meta != null ? meta.wrap(portableCtx) : null;
+                return meta != null ? meta.wrap(binaryCtx) : null;
             }
             else {
                 BinaryMetadataKey key = new BinaryMetadataKey(typeId);
@@ -517,7 +517,7 @@ public GridBinaryMarshaller marshaller() {
                 if (meta == null && !metaDataCache.context().preloader().syncFuture().isDone())
                     meta = metaDataCache.getTopologySafe(key);
 
-                return meta != null ? meta.wrap(portableCtx) : null;
+                return meta != null ? meta.wrap(binaryCtx) : null;
             }
         }
         catch (CacheException e) {
@@ -539,7 +539,7 @@ public GridBinaryMarshaller marshaller() {
             Map res = U.newHashMap(meta.size());
 
             for (Map.Entry e : meta.entrySet())
-                res.put(e.getKey().typeId(), e.getValue().wrap(portableCtx));
+                res.put(e.getKey().typeId(), e.getValue().wrap(binaryCtx));
 
             return res;
         }
@@ -563,7 +563,7 @@ public GridBinaryMarshaller marshaller() {
                     private static final long serialVersionUID = 0L;
 
                     @Override public BinaryType apply(Cache.Entry e) {
-                        return e.getValue().wrap(portableCtx);
+                        return e.getValue().wrap(binaryCtx);
                     }
                 });
         }
@@ -573,30 +573,30 @@ public GridBinaryMarshaller marshaller() {
     @Override public BinaryObject buildEnum(String typeName, int ord) throws IgniteException {
         typeName = BinaryContext.typeName(typeName);
 
-        int typeId = portableCtx.typeId(typeName);
+        int typeId = binaryCtx.typeId(typeName);
 
         updateMetadata(typeId, typeName, null, null, true);
 
-        return new BinaryEnumObjectImpl(portableCtx, typeId, null, ord);
+        return new BinaryEnumObjectImpl(binaryCtx, typeId, null, ord);
     }
 
     /** {@inheritDoc} */
     @Override public IgniteBinary binary() throws IgniteException {
-        return portables;
+        return binaries;
     }
 
     /** {@inheritDoc} */
-    @Override public boolean isPortableObject(Object obj) {
+    @Override public boolean isBinaryObject(Object obj) {
         return obj instanceof BinaryObject;
     }
 
     /** {@inheritDoc} */
-    @Override public boolean isPortableEnabled(CacheConfiguration ccfg) {
+    @Override public boolean isBinaryEnabled(CacheConfiguration ccfg) {
         return marsh instanceof BinaryMarshaller;
     }
 
     /**
-     * @param po Portable object.
+     * @param po Binary object.
      * @return Affinity key.
      */
     public Object affinityKey(BinaryObject po) {
@@ -612,14 +612,14 @@ public Object affinityKey(BinaryObject po) {
             else if (po instanceof BinaryObjectEx) {
                 int id = ((BinaryObjectEx)po).typeId();
 
-                String affKeyFieldName = portableCtx.affinityKeyFieldName(id);
+                String affKeyFieldName = binaryCtx.affinityKeyFieldName(id);
 
                 if (affKeyFieldName != null)
                     return po.field(affKeyFieldName);
             }
         }
         catch (BinaryObjectException e) {
-            U.error(log, "Failed to get affinity field from portable object: " + po, e);
+            U.error(log, "Failed to get affinity field from binary object: " + po, e);
         }
 
         return po;
@@ -630,7 +630,7 @@ else if (po instanceof BinaryObjectEx) {
         if (obj == null)
             return 0;
 
-        return isPortableObject(obj) ? ((BinaryObjectEx)obj).typeId() : typeId(obj.getClass().getSimpleName());
+        return isBinaryObject(obj) ? ((BinaryObjectEx)obj).typeId() : typeId(obj.getClass().getSimpleName());
     }
 
     /** {@inheritDoc} */
@@ -638,7 +638,7 @@ else if (po instanceof BinaryObjectEx) {
         if (obj == null)
             return null;
 
-        return isPortableObject(obj) ? ((BinaryObject)obj).field(fieldName) : super.field(obj, fieldName);
+        return isBinaryObject(obj) ? ((BinaryObject)obj).field(fieldName) : super.field(obj, fieldName);
     }
 
     /** {@inheritDoc} */
@@ -647,17 +647,17 @@ else if (po instanceof BinaryObjectEx) {
     }
 
     /**
-     * @return Portable context.
+     * @return Binary context.
      */
-    public BinaryContext portableContext() {
-        return portableCtx;
+    public BinaryContext binaryContext() {
+        return binaryCtx;
     }
 
     /** {@inheritDoc} */
     @Override public CacheObjectContext contextForCache(CacheConfiguration cfg) throws IgniteCheckedException {
         assert cfg != null;
 
-        boolean portableEnabled = marsh instanceof BinaryMarshaller && !GridCacheUtils.isSystemCache(cfg.getName()) &&
+        boolean binaryEnabled = marsh instanceof BinaryMarshaller && !GridCacheUtils.isSystemCache(cfg.getName()) &&
             !GridCacheUtils.isIgfsCache(ctx.config(), cfg.getName());
 
         CacheObjectContext ctx0 = super.contextForCache(cfg);
@@ -665,7 +665,7 @@ public BinaryContext portableContext() {
         CacheObjectContext res = new CacheObjectBinaryContext(ctx,
             ctx0.copyOnGet(),
             ctx0.storeValue(),
-            portableEnabled,
+            binaryEnabled,
             ctx0.addDeploymentInfo());
 
         ctx.resource().injectGeneric(res.defaultAffMapper());
@@ -675,10 +675,10 @@ public BinaryContext portableContext() {
 
     /** {@inheritDoc} */
     @Override public byte[] marshal(CacheObjectContext ctx, Object val) throws IgniteCheckedException {
-        if (!((CacheObjectBinaryContext)ctx).portableEnabled() || portableMarsh == null)
+        if (!((CacheObjectBinaryContext)ctx).binaryEnabled() || binaryMarsh == null)
             return super.marshal(ctx, val);
 
-        byte[] arr = portableMarsh.marshal(val);
+        byte[] arr = binaryMarsh.marshal(val);
 
         assert arr.length > 0;
 
@@ -688,22 +688,22 @@ public BinaryContext portableContext() {
     /** {@inheritDoc} */
     @Override public Object unmarshal(CacheObjectContext ctx, byte[] bytes, ClassLoader clsLdr)
         throws IgniteCheckedException {
-        if (!((CacheObjectBinaryContext)ctx).portableEnabled() || portableMarsh == null)
+        if (!((CacheObjectBinaryContext)ctx).binaryEnabled() || binaryMarsh == null)
             return super.unmarshal(ctx, bytes, clsLdr);
 
-        return portableMarsh.unmarshal(bytes, clsLdr);
+        return binaryMarsh.unmarshal(bytes, clsLdr);
     }
 
     /** {@inheritDoc} */
     @Override public KeyCacheObject toCacheKeyObject(CacheObjectContext ctx, Object obj, boolean userObj) {
-        if (!((CacheObjectBinaryContext)ctx).portableEnabled())
+        if (!((CacheObjectBinaryContext)ctx).binaryEnabled())
             return super.toCacheKeyObject(ctx, obj, userObj);
 
         if (obj instanceof KeyCacheObject)
             return (KeyCacheObject)obj;
 
-        if (((CacheObjectBinaryContext)ctx).portableEnabled()) {
-            obj = toPortable(obj);
+        if (((CacheObjectBinaryContext)ctx).binaryEnabled()) {
+            obj = toBinary(obj);
 
             if (obj instanceof BinaryObject)
                 return (BinaryObjectImpl)obj;
@@ -715,13 +715,13 @@ public BinaryContext portableContext() {
     /** {@inheritDoc} */
     @Nullable @Override public CacheObject toCacheObject(CacheObjectContext ctx, @Nullable Object obj,
         boolean userObj) {
-        if (!((CacheObjectBinaryContext)ctx).portableEnabled())
+        if (!((CacheObjectBinaryContext)ctx).binaryEnabled())
             return super.toCacheObject(ctx, obj, userObj);
 
         if (obj == null || obj instanceof CacheObject)
             return (CacheObject)obj;
 
-        obj = toPortable(obj);
+        obj = toBinary(obj);
 
         if (obj instanceof BinaryObject)
             return (BinaryObjectImpl)obj;
@@ -732,7 +732,7 @@ public BinaryContext portableContext() {
     /** {@inheritDoc} */
     @Override public CacheObject toCacheObject(CacheObjectContext ctx, byte type, byte[] bytes) {
         if (type == BinaryObjectImpl.TYPE_BINARY)
-            return new BinaryObjectImpl(portableContext(), bytes, 0);
+            return new BinaryObjectImpl(binaryContext(), bytes, 0);
 
         return super.toCacheObject(ctx, type, bytes);
     }
@@ -740,7 +740,7 @@ public BinaryContext portableContext() {
     /** {@inheritDoc} */
     @Override public CacheObject toCacheObject(GridCacheContext ctx, long valPtr, boolean tmp)
         throws IgniteCheckedException {
-        if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).portableEnabled())
+        if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).binaryEnabled())
             return super.toCacheObject(ctx, valPtr, tmp);
 
         Object val = unmarshal(valPtr, !tmp);
@@ -753,7 +753,7 @@ public BinaryContext portableContext() {
 
     /** {@inheritDoc} */
     @Override public Object unwrapTemporary(GridCacheContext ctx, Object obj) throws BinaryObjectException {
-        if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).portableEnabled())
+        if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).binaryEnabled())
             return obj;
 
         if (obj instanceof BinaryObjectOffheapImpl)
@@ -764,17 +764,17 @@ public BinaryContext portableContext() {
 
     /**
      * @param obj Object.
-     * @return Portable object.
+     * @return Binary object.
      * @throws IgniteException In case of error.
      */
-    @Nullable public Object toPortable(@Nullable Object obj) throws IgniteException {
+    @Nullable public Object toBinary(@Nullable Object obj) throws IgniteException {
         if (obj == null)
             return null;
 
-        if (isPortableObject(obj))
+        if (isBinaryObject(obj))
             return obj;
 
-        return marshalToPortable(obj);
+        return marshalToBinary(obj);
     }
 
     /**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java
index 4a225a59edb5f..1a2d0a929dafd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java
@@ -64,7 +64,7 @@ public IgniteBinaryImpl(GridKernalContext ctx, CacheObjectBinaryProcessor proc)
         guard();
 
         try {
-            return (T)proc.marshalToPortable(obj);
+            return (T)proc.marshalToBinary(obj);
         }
         finally {
             unguard();
@@ -84,11 +84,11 @@ public IgniteBinaryImpl(GridKernalContext ctx, CacheObjectBinaryProcessor proc)
     }
 
     /** {@inheritDoc} */
-    @Override public BinaryObjectBuilder builder(BinaryObject portableObj) {
+    @Override public BinaryObjectBuilder builder(BinaryObject binaryObj) {
         guard();
 
         try {
-            return proc.builder(portableObj);
+            return proc.builder(binaryObj);
         }
         finally {
             unguard();
@@ -156,7 +156,7 @@ public IgniteBinaryImpl(GridKernalContext ctx, CacheObjectBinaryProcessor proc)
     }
 
     /**
-     * @return Portable processor.
+     * @return Binary processor.
      */
     public IgniteCacheObjectProcessor processor() {
         return proc;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java
index b0e5c2f0c9f44..4e65d9c4795b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java
@@ -17,6 +17,6 @@
 
 /**
  * 
- * Implementation of portable processor.
+ * Implementation of binary processor.
  */
 package org.apache.ignite.internal.processors.cache.binary;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index 6447194a3bea4..f56cbf8a8adf5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -311,15 +311,15 @@ private void waitInitialization() throws IgniteCheckedException {
      *
      * @param key Key.
      * @param rmv {@code True} if entry was removed.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      */
-    public void onEntryUpdated(KeyCacheObject key, boolean rmv, boolean keepPortable) {
+    public void onEntryUpdated(KeyCacheObject key, boolean rmv, boolean keepBinary) {
         // No need to notify data structures manager for a user cache since all DS objects are stored
         // in system caches.
         if (cctx.userCache())
             return;
 
-        Object key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepPortable, false);
+        Object key0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false);
 
         if (key0 instanceof SetItemKey)
             onSetItemUpdated((SetItemKey)key0, rmv);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 360eb0f125c37..5d07b6faad974 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -251,7 +251,7 @@ public void keepBinary(boolean keepBinary) {
     }
 
     /**
-     * @return Keep portable.
+     * @return Keep binary.
      */
     public boolean keepBinary() {
         return (flags & KEEP_BINARY_FLAG_MASK) != 0;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
index 245ffc6f595fe..320c3c2b91eea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java
@@ -77,8 +77,8 @@ public abstract class CacheDistributedGetFutureAdapter extends GridCompoun
     /** Task name. */
     protected String taskName;
 
-    /** Whether to deserialize portable objects. */
-    protected boolean deserializePortable;
+    /** Whether to deserialize binary objects. */
+    protected boolean deserializeBinary;
 
     /** Skip values flag. */
     protected boolean skipVals;
@@ -103,7 +103,7 @@ public abstract class CacheDistributedGetFutureAdapter extends GridCompoun
      *          if called on backup node.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -117,7 +117,7 @@ protected CacheDistributedGetFutureAdapter(
         boolean forcePrimary,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean canRemap,
@@ -134,7 +134,7 @@ protected CacheDistributedGetFutureAdapter(
         this.forcePrimary = forcePrimary;
         this.subjId = subjId;
         this.taskName = taskName;
-        this.deserializePortable = deserializePortable;
+        this.deserializeBinary = deserializeBinary;
         this.expiryPlc = expiryPlc;
         this.skipVals = skipVals;
         this.canRemap = canRemap;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index ff8d315dbef29..9199e7060aac8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -625,7 +625,7 @@ else if (log.isDebugEnabled())
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         boolean skipVals,
         boolean canRemap
     ) {
@@ -636,7 +636,7 @@ else if (log.isDebugEnabled())
             /*don't check local tx. */false,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             forcePrimary,
             null,
             skipVals,
@@ -1164,7 +1164,7 @@ public Iterator> localEntriesIterator(final boolean primary, f
         assert primary || backup;
 
         if (primary && backup)
-            return iterator(map.entries0().iterator(), !ctx.keepPortable());
+            return iterator(map.entries0().iterator(), !ctx.keepBinary());
         else {
             final AffinityTopologyVersion topVer = ctx.affinity().affinityTopologyVersion();
 
@@ -1228,7 +1228,7 @@ private void advance() {
                 }
             };
 
-            return iterator(it, !ctx.keepPortable());
+            return iterator(it, !ctx.keepBinary());
         }
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index 626713a9762bd..e4102289d1fd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -380,7 +380,7 @@ private IgniteInternalFuture> getAsync(
             else {
                 fut = tx.getAllAsync(cctx,
                     keys.keySet(),
-                    /*deserialize portable*/false,
+                    /*deserialize binary*/false,
                     skipVals,
                     /*keep cache objects*/true,
                     /*skip store*/!readThrough);
@@ -410,7 +410,7 @@ private IgniteInternalFuture> getAsync(
                         else {
                             return tx.getAllAsync(cctx,
                                 keys.keySet(),
-                                /*deserialize portable*/false,
+                                /*deserialize binary*/false,
                                 skipVals,
                                 /*keep cache objects*/true,
                                 /*skip store*/!readThrough);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 90a9da8655b99..6867e21e319e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -88,7 +88,7 @@ public class GridPartitionedGetFuture extends CacheDistributedGetFutureAda
      *          if called on backup node.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -103,7 +103,7 @@ public GridPartitionedGetFuture(
         boolean forcePrimary,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean canRemap,
@@ -116,7 +116,7 @@ public GridPartitionedGetFuture(
             forcePrimary,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiryPlc,
             skipVals,
             canRemap,
@@ -400,7 +400,7 @@ private boolean map(
                                     null,
                                     taskName,
                                     expiryPlc,
-                                    !deserializePortable);
+                                    !deserializeBinary);
 
                                 if (res != null) {
                                     v = res.get1();
@@ -420,7 +420,7 @@ private boolean map(
                                     null,
                                     taskName,
                                     expiryPlc,
-                                    !deserializePortable);
+                                    !deserializeBinary);
                             }
 
                             colocated.context().evicts().touch(entry, topVer);
@@ -439,7 +439,7 @@ private boolean map(
                                         v,
                                         skipVals,
                                         keepCacheObjects,
-                                        deserializePortable,
+                                        deserializeBinary,
                                         true);
 
                                 return false;
@@ -524,7 +524,7 @@ private Map createResultMap(Collection infos) {
                         info.value(),
                         skipVals,
                         keepCacheObjects,
-                        deserializePortable,
+                        deserializeBinary,
                         false);
                 }
             }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 99cf21097335e..f955bb6f686e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -101,8 +101,8 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter im
     /** Task name. */
     private final String taskName;
 
-    /** Whether to deserialize portable objects. */
-    private boolean deserializePortable;
+    /** Whether to deserialize binary objects. */
+    private boolean deserializeBinary;
 
     /** Skip values flag. */
     private boolean skipVals;
@@ -130,7 +130,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter im
      * @param forcePrimary If {@code true} then will force network trip to primary node even if called on backup node.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -145,7 +145,7 @@ public GridPartitionedSingleGetFuture(
         boolean forcePrimary,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean canRemap,
@@ -160,7 +160,7 @@ public GridPartitionedSingleGetFuture(
         this.forcePrimary = forcePrimary;
         this.subjId = subjId;
         this.taskName = taskName;
-        this.deserializePortable = deserializePortable;
+        this.deserializeBinary = deserializeBinary;
         this.expiryPlc = expiryPlc;
         this.skipVals = skipVals;
         this.canRemap = canRemap;
@@ -580,7 +580,7 @@ private void setResult(@Nullable CacheObject val, @Nullable GridCacheVersion ver
                 }
                 else {
                     if (!keepCacheObjects) {
-                        Object res = cctx.unwrapPortableIfNeeded(val, !deserializePortable && !skipVals);
+                        Object res = cctx.unwrapBinaryIfNeeded(val, !deserializeBinary && !skipVals);
 
                         onDone(res);
                     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index d5e849e3e5e84..481317aaed9c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -321,7 +321,7 @@ public void near(GridNearAtomicCache near) {
         final boolean skipTx,
         @Nullable UUID subjId,
         final String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean skipVals,
         final boolean canRemap) {
         ctx.checkSecurity(SecurityPermission.CACHE_READ);
@@ -345,7 +345,7 @@ public void near(GridNearAtomicCache near) {
                     forcePrimary,
                     subjId0,
                     taskName,
-                    deserializePortable,
+                    deserializeBinary,
                     expiryPlc,
                     skipVals,
                     skipStore,
@@ -361,7 +361,7 @@ public void near(GridNearAtomicCache near) {
         boolean skipTx,
         @Nullable UUID subjId,
         final String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean skipVals,
         final boolean canRemap
     ) {
@@ -389,7 +389,7 @@ public void near(GridNearAtomicCache near) {
                     forcePrimary,
                     subjId0,
                     taskName,
-                    deserializePortable,
+                    deserializeBinary,
                     expiryPlc,
                     skipVals,
                     skipStore,
@@ -779,7 +779,7 @@ protected  IgniteInternalFuture asyncOp(final CO>
                         CacheInvokeResult invokeRes = (CacheInvokeResult)res;
 
                         if (invokeRes.result() != null)
-                            res = CacheInvokeResult.fromResult((T)ctx.unwrapPortableIfNeeded(invokeRes.result(),
+                            res = CacheInvokeResult.fromResult((T)ctx.unwrapBinaryIfNeeded(invokeRes.result(),
                                 keepBinary, false));
                     }
 
@@ -1004,7 +1004,7 @@ private IgniteInternalFuture removeAllAsync0(
      * @param forcePrimary Force primary flag.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param skipStore Skip store flag.
@@ -1015,7 +1015,7 @@ private IgniteInternalFuture getAsync0(KeyCacheObject key,
         boolean forcePrimary,
         UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable ExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean skipStore,
@@ -1033,7 +1033,7 @@ private IgniteInternalFuture getAsync0(KeyCacheObject key,
             forcePrimary,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiry,
             skipVals,
             canRemap,
@@ -1052,7 +1052,7 @@ private IgniteInternalFuture getAsync0(KeyCacheObject key,
      * @param forcePrimary Force primary flag.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param skipStore Skip store flag.
@@ -1062,7 +1062,7 @@ private IgniteInternalFuture> getAllAsync0(@Nullable Collection> getAllAsync0(@Nullable Collection> getAllAsync0(@Nullable Collection localPrevVals;
 
-    /** Keep portable flag. */
+    /** Keep binary flag. */
     private boolean keepBinary;
 
     /**
@@ -486,7 +486,7 @@ public KeyCacheObject nearKey(int idx) {
     }
 
     /**
-     * @return Keep portable flag.
+     * @return Keep binary flag.
      */
     public boolean keepBinary() {
         return keepBinary;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 513e6e82cdc5c..ba3d54600a04d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -325,7 +325,7 @@ public void map() {
 
         Object retval =
             res == null ? null : rawRetval ? ret : (this.retval || op == TRANSFORM) ?
-                cctx.unwrapPortableIfNeeded(ret.value(), keepBinary) : ret.success();
+                cctx.unwrapBinaryIfNeeded(ret.value(), keepBinary) : ret.success();
 
         if (op == TRANSFORM && retval == null)
             retval = Collections.emptyMap();
@@ -1191,7 +1191,7 @@ private void addFailedKeys(Collection failedKeys,
             Collection keys = new ArrayList<>(failedKeys.size());
 
             for (KeyCacheObject key : failedKeys)
-                keys.add(cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepBinary, false));
+                keys.add(cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false));
 
             err0.add(keys, err, topVer);
         }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index b7100ddbe7e7c..c24ad3447ed13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -151,7 +151,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri
     /** */
     private boolean clientReq;
 
-    /** Keep portable flag. */
+    /** Keep binary flag. */
     private boolean keepBinary;
 
     /**
@@ -341,7 +341,7 @@ public boolean skipStore() {
     }
 
     /**
-     * @return Keep portable flag.
+     * @return Keep binary flag.
      */
     public boolean keepBinary() {
         return keepBinary;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 19fefdb016a07..073043d71d321 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -198,7 +198,7 @@ public GridDistributedCacheEntry entryExx(
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean skipVals,
         boolean canRemap) {
         ctx.checkSecurity(SecurityPermission.CACHE_READ);
@@ -215,7 +215,7 @@ public GridDistributedCacheEntry entryExx(
                 @Override public IgniteInternalFuture op(IgniteTxLocalAdapter tx) {
                     IgniteInternalFuture>  fut = tx.getAllAsync(ctx,
                         Collections.singleton(ctx.toCacheKeyObject(key)),
-                        deserializePortable,
+                        deserializeBinary,
                         skipVals,
                         false,
                         opCtx != null && opCtx.skipStore());
@@ -254,7 +254,7 @@ public GridDistributedCacheEntry entryExx(
             forcePrimary,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null),
             skipVals,
             canRemap,
@@ -273,7 +273,7 @@ public GridDistributedCacheEntry entryExx(
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean skipVals,
         boolean canRemap
     ) {
@@ -294,7 +294,7 @@ public GridDistributedCacheEntry entryExx(
                 @Override public IgniteInternalFuture> op(IgniteTxLocalAdapter tx) {
                     return tx.getAllAsync(ctx,
                         ctx.cacheKeysView(keys),
-                        deserializePortable,
+                        deserializeBinary,
                         skipVals,
                         false,
                         opCtx != null && opCtx.skipStore());
@@ -315,7 +315,7 @@ public GridDistributedCacheEntry entryExx(
             topVer,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null),
             skipVals,
             canRemap);
@@ -341,7 +341,7 @@ public GridDistributedCacheEntry entryExx(
      * @param topVer Topology version.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param canRemap Can remap flag.
@@ -354,7 +354,7 @@ public IgniteInternalFuture> loadAsync(
         AffinityTopologyVersion topVer,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean canRemap) {
@@ -363,7 +363,7 @@ public IgniteInternalFuture> loadAsync(
             forcePrimary,
             topVer, subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiryPlc,
             skipVals,
             canRemap,
@@ -378,7 +378,7 @@ public IgniteInternalFuture> loadAsync(
      * @param topVer Topology version.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -393,7 +393,7 @@ public final IgniteInternalFuture loadAsync(
         AffinityTopologyVersion topVer,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean canRemap,
@@ -407,7 +407,7 @@ public final IgniteInternalFuture loadAsync(
             forcePrimary,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiryPlc,
             skipVals,
             canRemap,
@@ -426,7 +426,7 @@ public final IgniteInternalFuture loadAsync(
      * @param topVer Topology version.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -441,7 +441,7 @@ public final IgniteInternalFuture> loadAsync(
         AffinityTopologyVersion topVer,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean canRemap,
@@ -486,7 +486,7 @@ public final IgniteInternalFuture> loadAsync(
                                     null,
                                     taskName,
                                     expiryPlc,
-                                    !deserializePortable);
+                                    !deserializeBinary);
 
                                 if (res != null) {
                                     v = res.get1();
@@ -506,7 +506,7 @@ public final IgniteInternalFuture> loadAsync(
                                     null,
                                     taskName,
                                     expiryPlc,
-                                    !deserializePortable);
+                                    !deserializeBinary);
                             }
 
                             // Entry was not in memory or in swap, so we remove it from cache.
@@ -530,7 +530,7 @@ public final IgniteInternalFuture> loadAsync(
                                         v,
                                         skipVals,
                                         keepCacheObj,
-                                        deserializePortable,
+                                        deserializeBinary,
                                         true);
                                 }
                             }
@@ -582,7 +582,7 @@ else if (!skipVals && ctx.config().isStatisticsEnabled())
             forcePrimary,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiryPlc,
             skipVals,
             canRemap,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 49a267af1282d..06898cd527b86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -225,7 +225,7 @@ private void processNearAtomicUpdateResponse(
         @Nullable byte[] valBytes,
         long ttl,
         long expireTime,
-        boolean keepPortable,
+        boolean keepBinary,
         UUID nodeId,
         UUID subjId,
         String taskName
@@ -251,7 +251,7 @@ private void processNearAtomicUpdateResponse(
                         /*write-through*/false,
                         /*read-through*/false,
                         /*retval*/false,
-                        keepPortable,
+                        keepBinary,
                         /*expiry policy*/null,
                         /*event*/true,
                         /*metrics*/true,
@@ -395,7 +395,7 @@ public void processDhtAtomicUpdateRequest(
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         boolean skipVals,
         boolean canRemap
     ) {
@@ -416,7 +416,7 @@ public void processDhtAtomicUpdateRequest(
             forcePrimary,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             skipVals ? null : opCtx != null ? opCtx.expiry() : null,
             skipVals,
             opCtx != null && opCtx.skipStore(),
@@ -690,4 +690,4 @@ public void processDhtAtomicUpdateRequest(
             Thread.currentThread().interrupt();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 27ef99636853f..5bf18d9f9ecd3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -225,7 +225,7 @@ public boolean isAllLockedNearOnly(Iterable keys) {
      * @param forcePrimary Force primary flag.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVal Skip value flag.
      * @param skipStore Skip store flag.
@@ -237,7 +237,7 @@ public IgniteInternalFuture> loadAsync(@Nullable IgniteInternalTx tx,
         boolean forcePrimary,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable ExpiryPolicy expiryPlc,
         boolean skipVal,
         boolean skipStore,
@@ -257,7 +257,7 @@ public IgniteInternalFuture> loadAsync(@Nullable IgniteInternalTx tx,
             txx,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiry,
             skipVal,
             canRemap,
@@ -445,9 +445,9 @@ public Set nearKeySet(@Nullable CacheEntryPredicate filter) {
     }
 
     /** {@inheritDoc} */
-    @Override public V promote(K key, boolean deserializePortable) throws IgniteCheckedException {
+    @Override public V promote(K key, boolean deserializeBinary) throws IgniteCheckedException {
         // Unswap only from dht(). Near cache does not have swap storage.
-        return dht().promote(key, deserializePortable);
+        return dht().promote(key, deserializeBinary);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 970556923a340..cb866e37feab5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -91,7 +91,7 @@ public final class GridNearGetFuture extends CacheDistributedGetFutureAdap
      * @param tx Transaction.
      * @param subjId Subject ID.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -106,7 +106,7 @@ public GridNearGetFuture(
         @Nullable IgniteTxLocalEx tx,
         @Nullable UUID subjId,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean canRemap,
@@ -119,7 +119,7 @@ public GridNearGetFuture(
             forcePrimary,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             expiryPlc,
             skipVals,
             canRemap,
@@ -423,7 +423,7 @@ private Map map(
                             null,
                             taskName,
                             expiryPlc,
-                            !deserializePortable);
+                            !deserializeBinary);
 
                         if (res != null) {
                             v = res.get1();
@@ -443,7 +443,7 @@ private Map map(
                             null,
                             taskName,
                             expiryPlc,
-                            !deserializePortable);
+                            !deserializeBinary);
                     }
                 }
 
@@ -472,7 +472,7 @@ private Map map(
                                     null,
                                     taskName,
                                     expiryPlc,
-                                    !deserializePortable);
+                                    !deserializeBinary);
 
                                 if (res != null) {
                                     v = res.get1();
@@ -492,7 +492,7 @@ private Map map(
                                     null,
                                     taskName,
                                     expiryPlc,
-                                    !deserializePortable);
+                                    !deserializeBinary);
                             }
 
                             // Entry was not in memory or in swap, so we remove it from cache.
@@ -544,9 +544,9 @@ private Map map(
                             add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0)));
                         }
                         else {
-                            K key0 = (K)cctx.unwrapPortableIfNeeded(key, !deserializePortable, false);
+                            K key0 = (K)cctx.unwrapBinaryIfNeeded(key, !deserializeBinary, false);
                             V val0 = !skipVals ?
-                                (V)cctx.unwrapPortableIfNeeded(v, !deserializePortable, false) :
+                                (V)cctx.unwrapBinaryIfNeeded(v, !deserializeBinary, false) :
                                 (V)Boolean.TRUE;
 
                             add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0)));
@@ -681,7 +681,7 @@ private Map loadEntries(
                             info.ttl(),
                             info.expireTime(),
                             true,
-                            !deserializePortable,
+                            !deserializeBinary,
                             topVer,
                             subjId);
                     }
@@ -699,7 +699,7 @@ private Map loadEntries(
                             val,
                             skipVals,
                             keepCacheObjects,
-                            deserializePortable,
+                            deserializeBinary,
                             false);
                 }
                 catch (GridCacheEntryRemovedException ignore) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index 3441eeeff4f75..a09dec092f624 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -120,7 +120,7 @@ public void dht(GridDhtCache dht) {
         boolean skipTx,
         @Nullable UUID subjId,
         String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean skipVals,
         boolean canRemap
     ) {
@@ -143,7 +143,7 @@ public void dht(GridDhtCache dht) {
                 @Override public IgniteInternalFuture> op(IgniteTxLocalAdapter tx) {
                     return tx.getAllAsync(ctx,
                         ctx.cacheKeysView(keys),
-                        deserializePortable,
+                        deserializeBinary,
                         skipVals,
                         false,
                         skipStore);
@@ -158,7 +158,7 @@ public void dht(GridDhtCache dht) {
             forcePrimary,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             skipVals ? null : opCtx != null ? opCtx.expiry() : null,
             skipVals,
             skipStore,
@@ -169,7 +169,7 @@ public void dht(GridDhtCache dht) {
      * @param tx Transaction.
      * @param keys Keys to load.
      * @param readThrough Read through flag.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param expiryPlc Expiry policy.
      * @param skipVals Skip values flag.
      * @param needVer If {@code true} returns values as tuples containing value and version.
@@ -178,7 +178,7 @@ public void dht(GridDhtCache dht) {
     IgniteInternalFuture> txLoadAsync(GridNearTxLocal tx,
         @Nullable Collection keys,
         boolean readThrough,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean skipVals,
         boolean needVer) {
@@ -191,7 +191,7 @@ IgniteInternalFuture> txLoadAsync(GridNearTxLocal tx,
             tx,
             CU.subjectId(tx, ctx.shared()),
             tx.resolveTaskName(),
-            deserializePortable,
+            deserializeBinary,
             expiryPlc,
             skipVals,
             /*can remap*/true,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 2eb4c686d1ef8..ae4972ec41730 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -341,7 +341,7 @@ public void optimisticLockEntries(Collection optimisticLockEntrie
             return cacheCtx.nearTx().txLoadAsync(this,
                 keys,
                 readThrough,
-                /*deserializePortable*/false,
+                /*deserializeBinary*/false,
                 accessPolicy(cacheCtx, keys),
                 skipVals,
                 needVer).chain(new C1>, Void>() {
@@ -372,7 +372,7 @@ else if (cacheCtx.isColocated()) {
                     topologyVersion(),
                     CU.subjectId(this, cctx),
                     resolveTaskName(),
-                    /*deserializePortable*/false,
+                    /*deserializeBinary*/false,
                     accessPolicy(cacheCtx, keys),
                     skipVals,
                     /*can remap*/true,
@@ -403,7 +403,7 @@ else if (cacheCtx.isColocated()) {
                     topologyVersion(),
                     CU.subjectId(this, cctx),
                     resolveTaskName(),
-                    /*deserializePortable*/false,
+                    /*deserializeBinary*/false,
                     accessPolicy(cacheCtx, keys),
                     skipVals,
                     /*can remap*/true,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index dda5ed2ab5261..6130eadbf1827 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -477,14 +477,14 @@ public GridLocalAtomicCache(GridCacheContext ctx) {
     /** {@inheritDoc} */
 
     @SuppressWarnings("unchecked")
-    @Override @Nullable public V get(K key, boolean deserializePortable) throws IgniteCheckedException {
+    @Override @Nullable public V get(K key, boolean deserializeBinary) throws IgniteCheckedException {
         String taskName = ctx.kernalContext().job().currentTaskName();
 
         Map m = getAllInternal(Collections.singleton(key),
             ctx.isSwapOrOffheapEnabled(),
             ctx.readThrough(),
             taskName,
-            deserializePortable,
+            deserializeBinary,
             false);
 
         assert m.isEmpty() || m.size() == 1 : m.size();
@@ -494,7 +494,7 @@ public GridLocalAtomicCache(GridCacheContext ctx) {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public final Map getAll(Collection keys, boolean deserializePortable)
+    @Override public final Map getAll(Collection keys, boolean deserializeBinary)
         throws IgniteCheckedException {
         A.notNull(keys, "keys");
 
@@ -504,7 +504,7 @@ public GridLocalAtomicCache(GridCacheContext ctx) {
             ctx.isSwapOrOffheapEnabled(),
             ctx.readThrough(),
             taskName,
-            deserializePortable,
+            deserializeBinary,
             false);
     }
 
@@ -517,7 +517,7 @@ public GridLocalAtomicCache(GridCacheContext ctx) {
         boolean skipTx,
         @Nullable UUID subjId,
         final String taskName,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean skipVals,
         boolean canRemap
     ) {
@@ -528,7 +528,7 @@ public GridLocalAtomicCache(GridCacheContext ctx) {
 
         return asyncOp(new Callable>() {
             @Override public Map call() throws Exception {
-                return getAllInternal(keys, swapOrOffheap, storeEnabled, taskName, deserializePortable, skipVals);
+                return getAllInternal(keys, swapOrOffheap, storeEnabled, taskName, deserializeBinary, skipVals);
             }
         });
     }
@@ -540,7 +540,7 @@ public GridLocalAtomicCache(GridCacheContext ctx) {
      * @param swapOrOffheap {@code True} if swap of off-heap storage are enabled.
      * @param storeEnabled Store enabled flag.
      * @param taskName Task name.
-     * @param deserializePortable Deserialize portable .
+     * @param deserializeBinary Deserialize binary .
      * @param skipVals Skip value flag.
      * @return Key-value map.
      * @throws IgniteCheckedException If failed.
@@ -550,7 +550,7 @@ private Map getAllInternal(@Nullable Collection keys,
         boolean swapOrOffheap,
         boolean storeEnabled,
         String taskName,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         boolean skipVals
     ) throws IgniteCheckedException {
         ctx.checkSecurity(SecurityPermission.CACHE_READ);
@@ -596,10 +596,10 @@ private Map getAllInternal(@Nullable Collection keys,
                             null,
                             taskName,
                             expiry,
-                            !deserializePortable);
+                            !deserializeBinary);
 
                         if (v != null)
-                            ctx.addResult(vals, cacheKey, v, skipVals, false, deserializePortable, true);
+                            ctx.addResult(vals, cacheKey, v, skipVals, false, deserializeBinary, true);
                         else
                             success = false;
                     }
@@ -634,7 +634,7 @@ private Map getAllInternal(@Nullable Collection keys,
             false,
             subjId,
             taskName,
-            deserializePortable,
+            deserializeBinary,
             /*force primary*/false,
             expiry,
             skipVals,
@@ -667,7 +667,7 @@ private Map getAllInternal(@Nullable Collection keys,
 
         CacheOperationContext opCtx = ctx.operationContextPerCall();
 
-        final boolean keepPortable = opCtx != null && opCtx.isKeepBinary();
+        final boolean keepBinary = opCtx != null && opCtx.isKeepBinary();
 
         return (Map>)updateAllInternal(TRANSFORM,
             invokeMap.keySet(),
@@ -679,7 +679,7 @@ private Map getAllInternal(@Nullable Collection keys,
             null,
             ctx.writeThrough(),
             ctx.readThrough(),
-            keepPortable);
+            keepBinary);
     }
 
     /** {@inheritDoc} */
@@ -820,7 +820,7 @@ private IgniteInternalFuture updateAllAsync0(
 
         final ExpiryPolicy expiry = expiryPerCall();
 
-        final boolean keepPortable = opCtx != null && opCtx.isKeepBinary();
+        final boolean keepBinary = opCtx != null && opCtx.isKeepBinary();
 
         IgniteInternalFuture fut = asyncOp(new Callable() {
             @Override public Object call() throws Exception {
@@ -834,7 +834,7 @@ private IgniteInternalFuture updateAllAsync0(
                     filter,
                     writeThrough,
                     readThrough,
-                    keepPortable);
+                    keepBinary);
             }
         });
 
@@ -871,7 +871,7 @@ private IgniteInternalFuture removeAllAsync0(
 
         CacheOperationContext opCtx = ctx.operationContextPerCall();
 
-        final boolean keepPortable = opCtx != null && opCtx.isKeepBinary();
+        final boolean keepBinary = opCtx != null && opCtx.isKeepBinary();
 
         IgniteInternalFuture fut = asyncOp(new Callable() {
             @Override public Object call() throws Exception {
@@ -885,7 +885,7 @@ private IgniteInternalFuture removeAllAsync0(
                     filter,
                     writeThrough,
                     readThrough,
-                    keepPortable);
+                    keepBinary);
             }
         });
 
@@ -922,7 +922,7 @@ private Object updateAllInternal(GridCacheOperation op,
         CacheEntryPredicate[] filter,
         boolean writeThrough,
         boolean readThrough,
-        boolean keepPortable
+        boolean keepBinary
     ) throws IgniteCheckedException {
         if (keyCheck)
             validateCacheKeys(keys);
@@ -946,7 +946,7 @@ private Object updateAllInternal(GridCacheOperation op,
                 expiryPlc,
                 ver,
                 filter,
-                keepPortable,
+                keepBinary,
                 subjId,
                 taskName);
         }
@@ -987,7 +987,7 @@ private Object updateAllInternal(GridCacheOperation op,
                         writeThrough,
                         readThrough,
                         retval,
-                        keepPortable,
+                        keepBinary,
                         expiryPlc,
                         true,
                         true,
@@ -1042,7 +1042,7 @@ else if (res == null)
         if (err != null)
             throw err;
 
-        Object ret = res == null ? null : rawRetval ? new GridCacheReturn(ctx,  true, keepPortable, res.get2(), res.get1()) :
+        Object ret = res == null ? null : rawRetval ? new GridCacheReturn(ctx,  true, keepBinary, res.get2(), res.get1()) :
             (retval || op == TRANSFORM) ? res.get2() : res.get1();
 
         if (op == TRANSFORM && ret == null)
@@ -1075,7 +1075,7 @@ private Map updateWithBatch(
         @Nullable ExpiryPolicy expiryPlc,
         GridCacheVersion ver,
         @Nullable CacheEntryPredicate[] filter,
-        boolean keepPortable,
+        boolean keepBinary,
         UUID subjId,
         String taskName
     ) throws IgniteCheckedException {
@@ -1144,12 +1144,12 @@ private Map updateWithBatch(
                             entryProcessor,
                             taskName,
                             null,
-                            keepPortable);
+                            keepBinary);
 
                         Object oldVal = null;
 
                         CacheInvokeEntry invokeEntry = new CacheInvokeEntry<>(ctx, entry.key(), old,
-                            entry.version(), keepPortable);
+                            entry.version(), keepBinary);
 
                         CacheObject updated;
                         Object updatedVal = null;
@@ -1178,7 +1178,7 @@ private Map updateWithBatch(
                             if (intercept) {
                                 IgniteBiTuple interceptorRes = ctx.config().getInterceptor()
                                     .onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), invokeEntry.key(),
-                                        old, oldVal, keepPortable));
+                                        old, oldVal, keepBinary));
 
                                 if (ctx.cancelRemove(interceptorRes))
                                     continue;
@@ -1193,7 +1193,7 @@ private Map updateWithBatch(
                                     putMap,
                                     null,
                                     expiryPlc,
-                                    keepPortable,
+                                    keepBinary,
                                     err,
                                     subjId,
                                     taskName);
@@ -1214,7 +1214,7 @@ private Map updateWithBatch(
                             if (intercept) {
                                 Object interceptorVal = ctx.config().getInterceptor()
                                     .onBeforePut(new CacheLazyEntry(ctx, entry.key(), invokeEntry.getKey(),
-                                        old, oldVal, keepPortable), updatedVal);
+                                        old, oldVal, keepBinary), updatedVal);
 
                                 if (interceptorVal == null)
                                     continue;
@@ -1231,7 +1231,7 @@ private Map updateWithBatch(
                                     null,
                                     rmvKeys,
                                     expiryPlc,
-                                    keepPortable,
+                                    keepBinary,
                                     err,
                                     subjId,
                                     taskName);
@@ -1266,10 +1266,10 @@ else if (op == UPDATE) {
                                 null,
                                 taskName,
                                 null,
-                                keepPortable);
+                                keepBinary);
 
                             Object interceptorVal = ctx.config().getInterceptor().onBeforePut(new CacheLazyEntry(
-                                ctx, entry.key(), old, keepPortable), val);
+                                ctx, entry.key(), old, keepBinary), val);
 
                             if (interceptorVal == null)
                                 continue;
@@ -1301,10 +1301,10 @@ else if (op == UPDATE) {
                                 null,
                                 taskName,
                                 null,
-                                keepPortable);
+                                keepBinary);
 
                             IgniteBiTuple interceptorRes = ctx.config().getInterceptor()
-                                .onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), old, keepPortable));
+                                .onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), old, keepBinary));
 
                             if (ctx.cancelRemove(interceptorRes))
                                 continue;
@@ -1338,7 +1338,7 @@ else if (op == UPDATE) {
                     putMap,
                     rmvKeys,
                     expiryPlc,
-                    keepPortable,
+                    keepBinary,
                     err,
                     subjId,
                     taskName);
@@ -1376,7 +1376,7 @@ else if (op == UPDATE) {
         @Nullable Map putMap,
         @Nullable Collection rmvKeys,
         @Nullable ExpiryPolicy expiryPlc,
-        boolean keepPortable,
+        boolean keepBinary,
         @Nullable CachePartialUpdateCheckedException err,
         UUID subjId,
         String taskName
@@ -1446,7 +1446,7 @@ else if (op == UPDATE) {
                     false,
                     false,
                     false,
-                    keepPortable,
+                    keepBinary,
                     expiryPlc,
                     true,
                     true,
@@ -1457,9 +1457,9 @@ else if (op == UPDATE) {
 
                 if (intercept) {
                     if (op == UPDATE)
-                        ctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(ctx, entry.key(), writeVal, keepPortable));
+                        ctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(ctx, entry.key(), writeVal, keepBinary));
                     else
-                        ctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(ctx, entry.key(), t.get2(), keepPortable));
+                        ctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(ctx, entry.key(), t.get2(), keepBinary));
                 }
             }
             catch (GridCacheEntryRemovedException ignore) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index 578f6deaee2f5..7f63b4c661765 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -273,7 +273,7 @@ protected void removeQueryFuture(long reqId) {
                 req.className(),
                 req.clause(),
                 req.includeMetaData(),
-                req.keepPortable(),
+                req.keepBinary(),
                 req.subjectId(),
                 req.taskHash()
             );
@@ -566,7 +566,7 @@ else if (!cancelled.contains(res.requestId()))
                 qry.query().includeBackups(),
                 qry.arguments(),
                 false,
-                qry.query().keepPortable(),
+                qry.query().keepBinary(),
                 qry.query().subjectId(),
                 qry.query().taskHash(),
                 queryTopologyVersion(),
@@ -612,7 +612,7 @@ else if (!cancelled.contains(res.requestId()))
                 qry.includeBackups(),
                 fut.fields(),
                 all,
-                qry.keepPortable(),
+                qry.keepBinary(),
                 qry.subjectId(),
                 qry.taskHash(),
                 queryTopologyVersion(),
@@ -679,7 +679,7 @@ else if (!cancelled.contains(res.requestId()))
                 qry.query().includeBackups(),
                 qry.arguments(),
                 qry.query().includeMetadata(),
-                qry.query().keepPortable(),
+                qry.query().keepBinary(),
                 qry.query().subjectId(),
                 qry.query().taskHash(),
                 queryTopologyVersion(),
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 855e23925025e..b948dc5b3d8e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -73,7 +73,7 @@ public class GridCacheQueryAdapter implements CacheQuery {
     /** */
     private final IgniteLogger log;
 
-    /** Class name in case of portable query. */
+    /** Class name in case of binary query. */
     private final String clsName;
 
     /** */
@@ -110,7 +110,7 @@ public class GridCacheQueryAdapter implements CacheQuery {
     private volatile ClusterGroup prj;
 
     /** */
-    private boolean keepPortable;
+    private boolean keepBinary;
 
     /** */
     private UUID subjId;
@@ -126,7 +126,7 @@ public class GridCacheQueryAdapter implements CacheQuery {
      * @param filter Scan filter.
      * @param part Partition.
      * @param incMeta Include metadata flag.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      */
     public GridCacheQueryAdapter(GridCacheContext cctx,
         GridCacheQueryType type,
@@ -135,7 +135,7 @@ public GridCacheQueryAdapter(GridCacheContext cctx,
         @Nullable IgniteBiPredicate filter,
         @Nullable Integer part,
         boolean incMeta,
-        boolean keepPortable) {
+        boolean keepBinary) {
         assert cctx != null;
         assert type != null;
         assert part == null || part >= 0;
@@ -147,7 +147,7 @@ public GridCacheQueryAdapter(GridCacheContext cctx,
         this.filter = filter;
         this.part = part;
         this.incMeta = incMeta;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
 
         log = cctx.logger(getClass());
 
@@ -169,7 +169,7 @@ public GridCacheQueryAdapter(GridCacheContext cctx,
      * @param clsName Class name.
      * @param clause Clause.
      * @param incMeta Include metadata flag.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @param subjId Security subject ID.
      * @param taskHash Task hash.
      */
@@ -187,7 +187,7 @@ public GridCacheQueryAdapter(GridCacheContext cctx,
         @Nullable String clsName,
         String clause,
         boolean incMeta,
-        boolean keepPortable,
+        boolean keepBinary,
         UUID subjId,
         int taskHash) {
         this.cctx = cctx;
@@ -204,7 +204,7 @@ public GridCacheQueryAdapter(GridCacheContext cctx,
         this.clsName = clsName;
         this.clause = clause;
         this.incMeta = incMeta;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
         this.subjId = subjId;
         this.taskHash = taskHash;
     }
@@ -238,19 +238,19 @@ public boolean includeMetadata() {
     }
 
     /**
-     * @return {@code True} if portable should not be deserialized.
+     * @return {@code True} if binary should not be deserialized.
      */
-    public boolean keepPortable() {
-        return keepPortable;
+    public boolean keepBinary() {
+        return keepBinary;
     }
 
     /**
-     * Forces query to keep portable object representation even if query was created on plain projection.
+     * Forces query to keep binary object representation even if query was created on plain projection.
      *
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      */
-    public void keepPortable(boolean keepPortable) {
-        this.keepPortable = keepPortable;
+    public void keepBinary(boolean keepBinary) {
+        this.keepBinary = keepBinary;
     }
 
     /**
@@ -721,4 +721,4 @@ else if (e.hasCause(ClusterGroupEmptyCheckedException.class)) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
index 2a4fbdac034c4..e3e5d98023fa5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
@@ -402,7 +402,7 @@ public void onPage(@Nullable UUID nodeId, @Nullable Collection data, @Nullabl
 
                 data = dedupIfRequired((Collection)data);
 
-                data = cctx.unwrapPortablesIfNeeded((Collection)data, qry.query().keepPortable());
+                data = cctx.unwrapBinariesIfNeeded((Collection)data, qry.query().keepBinary());
 
                 synchronized (mux) {
                     enqueue(data);
@@ -583,4 +583,4 @@ public void printMemoryStats() {
         X.println(">>>  keysSize: " + keys.size());
         X.println(">>>  cnt: " + cnt);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 4681e47445c68..15502a0e881c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -807,8 +807,8 @@ private GridCloseableIterator> scanIterator(final GridCacheQ
         throws IgniteCheckedException {
         IgniteInternalCache prj0 = cctx.cache();
 
-        if (qry.keepPortable())
-            prj0 = prj0.keepPortable();
+        if (qry.keepBinary())
+            prj0 = prj0.keepBinary();
 
         final IgniteInternalCache prj = prj0;
 
@@ -907,7 +907,7 @@ private void advance() {
                                     entry != null ? entry.peek(true, false, false, topVer, expiryPlc) : null;
 
                                 // TODO 950 nocopy
-                                val = (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(cacheVal, qry.keepPortable());
+                                val = (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheVal, qry.keepBinary());
                             }
                             catch (GridCacheEntryRemovedException e) {
                                 val = null;
@@ -960,7 +960,7 @@ private void sendTtlUpdate() {
 
                     private boolean checkPredicate(Map.Entry e) {
                         if (keyValFilter != null) {
-                            Map.Entry e0 = (Map.Entry)cctx.unwrapPortableIfNeeded(e, qry.keepPortable());
+                            Map.Entry e0 = (Map.Entry)cctx.unwrapBinaryIfNeeded(e, qry.keepBinary());
 
                             return keyValFilter.apply(e0.getKey(), e0.getValue());
                         }
@@ -1043,7 +1043,7 @@ private GridIterator> swapIterator(GridCacheQueryAdapter
         Iterator> it = part == null ? cctx.swap().rawSwapIterator(true, backups) :
             cctx.swap().rawSwapIterator(part);
 
-        return scanIterator(it, filter, qry.keepPortable());
+        return scanIterator(it, filter, qry.keepBinary());
     }
 
     /**
@@ -1055,27 +1055,27 @@ private GridIterator> offheapIterator(GridCacheQueryAdapter<
         IgniteBiPredicate filter = qry.scanFilter();
 
         if (cctx.offheapTiered() && filter != null) {
-            OffheapIteratorClosure c = new OffheapIteratorClosure(filter, qry.keepPortable());
+            OffheapIteratorClosure c = new OffheapIteratorClosure(filter, qry.keepBinary());
 
             return cctx.swap().rawOffHeapIterator(c, qry.partition(), true, backups);
         }
         else {
             Iterator> it = cctx.swap().rawOffHeapIterator(qry.partition(), true, backups);
 
-            return scanIterator(it, filter, qry.keepPortable());
+            return scanIterator(it, filter, qry.keepBinary());
         }
     }
 
     /**
      * @param it Lazy swap or offheap iterator.
      * @param filter Scan filter.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Iterator.
      */
     private GridIteratorAdapter> scanIterator(
         @Nullable final Iterator> it,
         @Nullable final IgniteBiPredicate filter,
-        final boolean keepPortable) {
+        final boolean keepBinary) {
         if (it == null)
             return new GridEmptyCloseableIterator<>();
 
@@ -1109,11 +1109,11 @@ private void advance() {
                 next = null;
 
                 while (it.hasNext()) {
-                    final LazySwapEntry e = new LazySwapEntry(it.next(), keepPortable);
+                    final LazySwapEntry e = new LazySwapEntry(it.next(), keepBinary);
 
                     if (filter != null) {
-                        K key = (K)cctx.unwrapPortableIfNeeded(e.key(), keepPortable);
-                        V val = (V)cctx.unwrapPortableIfNeeded(e.value(), keepPortable);
+                        K key = (K)cctx.unwrapBinaryIfNeeded(e.key(), keepBinary);
+                        V val = (V)cctx.unwrapBinaryIfNeeded(e.value(), keepBinary);
 
                         if (!filter.apply(key, val))
                             continue;
@@ -1536,7 +1536,7 @@ protected void runQuery(GridCacheQueryInfo qryInfo) {
 
                     // Unwrap entry for reducer or transformer only.
                     if (rdc != null || trans != null)
-                        entry = (Map.Entry)cctx.unwrapPortableIfNeeded(entry, qry.keepPortable());
+                        entry = (Map.Entry)cctx.unwrapBinaryIfNeeded(entry, qry.keepBinary());
 
                     // Reduce.
                     if (rdc != null) {
@@ -2549,7 +2549,7 @@ private class LazySwapEntry extends AbstractLazySwapEntry {
 
             CacheObject obj = cctx.cacheObjects().toCacheObject(cctx.cacheObjectContext(), t.get2(), t.get1());
 
-            return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(obj, keepBinary);
+            return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(obj, keepBinary);
         }
 
         /** {@inheritDoc} */
@@ -2636,19 +2636,19 @@ private class OffheapIteratorClosure
         private IgniteBiPredicate filter;
 
         /** */
-        private boolean keepPortable;
+        private boolean keepBinary;
 
         /**
          * @param filter Filter.
-         * @param keepPortable Keep portable flag.
+         * @param keepBinary Keep binary flag.
          */
         private OffheapIteratorClosure(
             @Nullable IgniteBiPredicate filter,
-            boolean keepPortable) {
+            boolean keepBinary) {
             assert filter != null;
 
             this.filter = filter;
-            this.keepPortable = keepPortable;
+            this.keepBinary = keepBinary;
         }
 
         /** {@inheritDoc} */
@@ -2657,8 +2657,8 @@ private OffheapIteratorClosure(
             throws IgniteCheckedException {
             LazyOffheapEntry e = new LazyOffheapEntry(keyPtr, valPtr);
 
-            K key = (K)cctx.unwrapPortableIfNeeded(e.key(), keepPortable);
-            V val = (V)cctx.unwrapPortableIfNeeded(e.value(), keepPortable);
+            K key = (K)cctx.unwrapBinaryIfNeeded(e.key(), keepBinary);
+            V val = (V)cctx.unwrapBinaryIfNeeded(e.value(), keepBinary);
 
             if (!filter.apply(key, val))
                 return null;
@@ -3042,10 +3042,10 @@ public int size() {
     /**
      * Query for {@link IndexingSpi}.
      *
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Query.
      */
-    public  CacheQuery createSpiQuery(boolean keepPortable) {
+    public  CacheQuery createSpiQuery(boolean keepBinary) {
         return new GridCacheQueryAdapter<>(cctx,
             SPI,
             null,
@@ -3053,7 +3053,7 @@ public  CacheQuery createSpiQuery(boolean keepPortable) {
             null,
             null,
             false,
-            keepPortable);
+            keepBinary);
     }
 
     /**
@@ -3061,11 +3061,11 @@ public  CacheQuery createSpiQuery(boolean keepPortable) {
      *
      * @param filter Scan filter.
      * @param part Partition.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Created query.
      */
     public CacheQuery> createScanQuery(@Nullable IgniteBiPredicate filter,
-        @Nullable Integer part, boolean keepPortable) {
+        @Nullable Integer part, boolean keepBinary) {
 
         return new GridCacheQueryAdapter<>(cctx,
             SCAN,
@@ -3074,7 +3074,7 @@ public CacheQuery> createScanQuery(@Nullable IgniteBiPredicate)filter,
             part,
             false,
-            keepPortable);
+            keepBinary);
     }
 
     /**
@@ -3083,11 +3083,11 @@ public CacheQuery> createScanQuery(@Nullable IgniteBiPredicate> createFullTextQuery(String clsName,
-        String search, boolean keepPortable) {
+        String search, boolean keepBinary) {
         A.notNull("clsName", clsName);
         A.notNull("search", search);
 
@@ -3098,7 +3098,7 @@ public CacheQuery> createFullTextQuery(String clsName,
             null,
             null,
             false,
-            keepPortable);
+            keepBinary);
     }
 
     /**
@@ -3106,10 +3106,10 @@ public CacheQuery> createFullTextQuery(String clsName,
      * documentation.
      *
      * @param qry Query.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Created query.
      */
-    public CacheQuery> createSqlFieldsQuery(String qry, boolean keepPortable) {
+    public CacheQuery> createSqlFieldsQuery(String qry, boolean keepBinary) {
         A.notNull(qry, "qry");
 
         return new GridCacheQueryAdapter<>(cctx,
@@ -3119,6 +3119,6 @@ public CacheQuery> createSqlFieldsQuery(String qry, boolean keepPortable
             null,
             null,
             false,
-            keepPortable);
+            keepBinary);
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index fa2d6b1426cd7..9fae5e122c090 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -111,7 +111,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
     private boolean all;
 
     /** */
-    private boolean keepPortable;
+    private boolean keepBinary;
 
     /** */
     private UUID subjId;
@@ -165,7 +165,7 @@ public GridCacheQueryRequest(int cacheId,
      * @param incBackups {@code true} if need to include backups.
      * @param fields Fields query flag.
      * @param all Whether to load all pages.
-     * @param keepPortable Whether to keep binary.
+     * @param keepBinary Whether to keep binary.
      * @param subjId Subject ID.
      * @param taskHash Task name hash code.
      * @param topVer Topology version.
@@ -179,7 +179,7 @@ public GridCacheQueryRequest(
         boolean incBackups,
         boolean fields,
         boolean all,
-        boolean keepPortable,
+        boolean keepBinary,
         UUID subjId,
         int taskHash,
         AffinityTopologyVersion topVer,
@@ -192,7 +192,7 @@ public GridCacheQueryRequest(
         this.incBackups = incBackups;
         this.fields = fields;
         this.all = all;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
         this.subjId = subjId;
         this.taskHash = taskHash;
         this.topVer = topVer;
@@ -215,7 +215,7 @@ public GridCacheQueryRequest(
      * @param incBackups {@code true} if need to include backups.
      * @param args Query arguments.
      * @param incMeta Include meta data or not.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @param subjId Subject ID.
      * @param taskHash Task name hash code.
      * @param topVer Topology version.
@@ -237,7 +237,7 @@ public GridCacheQueryRequest(
         boolean incBackups,
         Object[] args,
         boolean incMeta,
-        boolean keepPortable,
+        boolean keepBinary,
         UUID subjId,
         int taskHash,
         AffinityTopologyVersion topVer,
@@ -262,7 +262,7 @@ public GridCacheQueryRequest(
         this.incBackups = incBackups;
         this.args = args;
         this.incMeta = incMeta;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
         this.subjId = subjId;
         this.taskHash = taskHash;
         this.topVer = topVer;
@@ -454,8 +454,8 @@ public boolean allPages() {
     /**
      * @return Whether to keep binary.
      */
-    public boolean keepPortable() {
-        return keepPortable;
+    public boolean keepBinary() {
+        return keepBinary;
     }
 
     /**
@@ -555,7 +555,7 @@ public int taskHash() {
                 writer.incrementState();
 
             case 13:
-                if (!writer.writeBoolean("keepPortable", keepPortable))
+                if (!writer.writeBoolean("keepBinary", keepBinary))
                     return false;
 
                 writer.incrementState();
@@ -711,7 +711,7 @@ public int taskHash() {
                 reader.incrementState();
 
             case 13:
-                keepPortable = reader.readBoolean("keepPortable");
+                keepBinary = reader.readBoolean("keepBinary");
 
                 if (!reader.isLastRead())
                     return false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
index f665339211e63..d26e66629e316 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
@@ -59,18 +59,18 @@ CacheContinuousQueryEntry entry() {
     /** {@inheritDoc} */
     @Override
     public K getKey() {
-        return (K)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.key(), e.isKeepBinary(), false);
+        return (K)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.key(), e.isKeepBinary(), false);
     }
 
     /** {@inheritDoc} */
     @Override public V getValue() {
-        return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.value(), e.isKeepBinary(), false);
+        return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.value(), e.isKeepBinary(), false);
     }
 
     /** {@inheritDoc} */
     @Override
     public V getOldValue() {
-        return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.oldValue(), e.isKeepBinary(), false);
+        return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.oldValue(), e.isKeepBinary(), false);
     }
 
     /** {@inheritDoc} */
@@ -94,4 +94,4 @@ public V getOldValue() {
             "newVal", getValue(),
             "oldVal", getOldValue());
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
index d001c762d6709..e89483abd553c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
@@ -57,7 +57,7 @@ public CacheOsStoreManager(GridKernalContext ctx, CacheConfiguration cfg) {
             if (store instanceof PlatformCacheStore) {
                 PlatformProcessor proc = ctx.platform();
 
-                proc.registerStore((PlatformCacheStore)store, configuredConvertPortable());
+                proc.registerStore((PlatformCacheStore)store, configuredConvertBinary());
             }
         }
 
@@ -76,12 +76,12 @@ public CacheOsStoreManager(GridKernalContext ctx, CacheConfiguration cfg) {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean convertPortable() {
-        return configuredConvertPortable() && !(cfgStore instanceof PlatformCacheStore);
+    @Override public boolean convertBinary() {
+        return configuredConvertBinary() && !(cfgStore instanceof PlatformCacheStore);
     }
 
     /** {@inheritDoc} */
-    @Override public boolean configuredConvertPortable() {
+    @Override public boolean configuredConvertBinary() {
         return !(ctx.config().getMarshaller() instanceof BinaryMarshaller && cfg.isKeepBinaryInStore());
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
index 509c8061a1747..67c9334fa6ed2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
@@ -188,12 +188,12 @@ public boolean removeAll(@Nullable IgniteInternalTx tx, Collection keys)
     public void forceFlush() throws IgniteCheckedException;
 
     /**
-     * @return Convert-portable flag.
+     * @return Convert-binary flag.
      */
-    public boolean convertPortable();
+    public boolean convertBinary();
 
     /**
-     * @return Configured convert portable flag.
+     * @return Configured convert binary flag.
      */
-    public boolean configuredConvertPortable();
-}
\ No newline at end of file
+    public boolean configuredConvertBinary();
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
index af3a77bb7f54b..7ffebbdf4989d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
@@ -283,7 +283,7 @@ private CacheStore cacheStoreWrapper(GridKernalContext ctx,
                 // Never load internal keys from store as they are never persisted.
                 return null;
 
-            Object storeKey = cctx.unwrapPortableIfNeeded(key, !convertPortable());
+            Object storeKey = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
 
             if (log.isDebugEnabled())
                 log.debug("Loading value from store for key: " + storeKey);
@@ -410,7 +410,7 @@ private void loadAllFromStore(@Nullable IgniteInternalTx tx,
             Collection keys0 = F.viewReadOnly(keys,
                 new C1() {
                     @Override public Object apply(KeyCacheObject key) {
-                        return cctx.unwrapPortableIfNeeded(key, !convertPortable());
+                        return cctx.unwrapBinaryIfNeeded(key, !convertBinary());
                     }
                 });
 
@@ -533,8 +533,8 @@ private void loadAllFromStore(@Nullable IgniteInternalTx tx,
             if (key instanceof GridCacheInternal)
                 return true;
 
-            key = cctx.unwrapPortableIfNeeded(key, !convertPortable());
-            val = cctx.unwrapPortableIfNeeded(val, !convertPortable());
+            key = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
+            val = cctx.unwrapBinaryIfNeeded(val, !convertBinary());
 
             if (log.isDebugEnabled())
                 log.debug("Storing value in cache store [key=" + key + ", val=" + val + ']');
@@ -636,7 +636,7 @@ private void loadAllFromStore(@Nullable IgniteInternalTx tx,
             if (key instanceof GridCacheInternal)
                 return false;
 
-            key = cctx.unwrapPortableIfNeeded(key, !convertPortable());
+            key = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
 
             if (log.isDebugEnabled())
                 log.debug("Removing value from cache store [key=" + key + ']');
@@ -684,7 +684,7 @@ private void loadAllFromStore(@Nullable IgniteInternalTx tx,
         }
 
         if (store != null) {
-            Collection keys0 = cctx.unwrapPortablesIfNeeded(keys, !convertPortable());
+            Collection keys0 = cctx.unwrapBinariesIfNeeded(keys, !convertBinary());
 
             if (log.isDebugEnabled())
                 log.debug("Removing values from cache store [keys=" + keys0 + ']');
@@ -771,7 +771,7 @@ private void handleClassCastException(ClassCastException e) throws IgniteChecked
         assert e != null;
 
         if (e.getMessage() != null) {
-            throw new IgniteCheckedException("Cache store must work with portable objects if binary are " +
+            throw new IgniteCheckedException("Cache store must work with binary objects if binary are " +
                 "enabled for cache [cacheName=" + cctx.namex() + ']', e);
         }
         else
@@ -1093,8 +1093,8 @@ private void checkNext() {
 
                         Object v = locStore ? e.getValue() : e.getValue().get1();
 
-                        k = cctx.unwrapPortableIfNeeded(k, !convertPortable());
-                        v = cctx.unwrapPortableIfNeeded(v, !convertPortable());
+                        k = cctx.unwrapBinaryIfNeeded(k, !convertBinary());
+                        v = cctx.unwrapBinaryIfNeeded(v, !convertBinary());
 
                         if (rmvd != null && rmvd.contains(k))
                             continue;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 33c0fa94df9fa..a3aed34572eab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -714,7 +714,7 @@ protected void batchStoreCommit(Iterable writeEntries) throws Ign
                                         key,
                                         e.cached().rawGetOrUnmarshal(true),
                                         e.keepBinary()),
-                                    cacheCtx.cacheObjectContext().unwrapPortableIfNeeded(val, e.keepBinary(), false));
+                                    cacheCtx.cacheObjectContext().unwrapBinaryIfNeeded(val, e.keepBinary(), false));
 
                                 if (interceptorVal == null)
                                     continue;
@@ -1342,7 +1342,7 @@ private boolean primaryLocal(GridCacheEntryEx entry) {
      * @param map Return map.
      * @param missed Map of missed keys.
      * @param keysCnt Keys count (to avoid call to {@code Collection.size()}).
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param skipVals Skip values flag.
      * @param keepCacheObjects Keep cache objects flag.
      * @param skipStore Skip store flag.
@@ -1357,7 +1357,7 @@ private  Collection enlistRead(
         Map map,
         Map missed,
         int keysCnt,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         boolean skipVals,
         boolean keepCacheObjects,
         boolean skipStore
@@ -1396,7 +1396,7 @@ private  Collection enlistRead(
                         val = txEntry.applyEntryProcessors(val);
 
                     if (val != null)
-                        cacheCtx.addResult(map, key, val, skipVals, keepCacheObjects, deserializePortable, false);
+                        cacheCtx.addResult(map, key, val, skipVals, keepCacheObjects, deserializeBinary, false);
                 }
                 else {
                     assert txEntry.op() == TRANSFORM;
@@ -1433,7 +1433,7 @@ private  Collection enlistRead(
                                     val,
                                     skipVals,
                                     keepCacheObjects,
-                                    deserializePortable,
+                                    deserializeBinary,
                                     false);
                             }
                             else
@@ -1479,7 +1479,7 @@ private  Collection enlistRead(
                                         null,
                                         resolveTaskName(),
                                         accessPlc,
-                                        !deserializePortable) : null;
+                                        !deserializeBinary) : null;
 
                                 if (res != null) {
                                     val = res.get1();
@@ -1499,7 +1499,7 @@ private  Collection enlistRead(
                                     null,
                                     resolveTaskName(),
                                     accessPlc,
-                                    !deserializePortable);
+                                    !deserializeBinary);
                             }
 
                             if (val != null) {
@@ -1508,7 +1508,7 @@ private  Collection enlistRead(
                                     val,
                                     skipVals,
                                     keepCacheObjects,
-                                    deserializePortable,
+                                    deserializeBinary,
                                     false);
                             }
                             else
@@ -1531,7 +1531,7 @@ private  Collection enlistRead(
                                 -1L,
                                 null,
                                 skipStore,
-                                !deserializePortable);
+                                !deserializeBinary);
 
                             // As optimization, mark as checked immediately
                             // for non-pessimistic if value is not null.
@@ -1597,7 +1597,7 @@ protected IgniteCacheExpiryPolicy accessPolicy(GridCacheContext cacheCtx, Collec
      * @param cacheCtx Cache context.
      * @param map Return map.
      * @param missedMap Missed keys.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param skipVals Skip values flag.
      * @param keepCacheObjects Keep cache objects flag.
      * @param skipStore Skip store flag.
@@ -1607,7 +1607,7 @@ private  IgniteInternalFuture> checkMissed(
         final GridCacheContext cacheCtx,
         final Map map,
         final Map missedMap,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean skipVals,
         final boolean keepCacheObjects,
         final boolean skipStore
@@ -1636,7 +1636,7 @@ private  IgniteInternalFuture> checkMissed(
                 missedMap.keySet(),
                 skipVals,
                 needReadVer,
-                !deserializePortable,
+                !deserializeBinary,
                 new GridInClosure3() {
                     @Override public void apply(KeyCacheObject key, Object val, GridCacheVersion loadVer) {
                         if (isRollbackOnly()) {
@@ -1676,7 +1676,7 @@ private  IgniteInternalFuture> checkMissed(
                                     visibleVal,
                                     skipVals,
                                     keepCacheObjects,
-                                    deserializePortable,
+                                    deserializeBinary,
                                     false);
                             }
                         }
@@ -1697,7 +1697,7 @@ private  IgniteInternalFuture> checkMissed(
                                     visibleVal,
                                     skipVals,
                                     keepCacheObjects,
-                                    deserializePortable,
+                                    deserializeBinary,
                                     false);
                             }
                         }
@@ -1710,7 +1710,7 @@ private  IgniteInternalFuture> checkMissed(
     @Override public  IgniteInternalFuture> getAllAsync(
         final GridCacheContext cacheCtx,
         Collection keys,
-        final boolean deserializePortable,
+        final boolean deserializeBinary,
         final boolean skipVals,
         final boolean keepCacheObjects,
         final boolean skipStore) {
@@ -1740,7 +1740,7 @@ private  IgniteInternalFuture> checkMissed(
                 retMap,
                 missed,
                 keysCnt,
-                deserializePortable,
+                deserializeBinary,
                 skipVals,
                 keepCacheObjects,
                 skipStore);
@@ -1773,7 +1773,7 @@ private  IgniteInternalFuture> checkMissed(
                         for (KeyCacheObject cacheKey : lockKeys) {
                             K keyVal = (K)
                                 (keepCacheObjects ? cacheKey :
-                                cacheCtx.cacheObjectContext().unwrapPortableIfNeeded(cacheKey, !deserializePortable));
+                                cacheCtx.cacheObjectContext().unwrapBinaryIfNeeded(cacheKey, !deserializeBinary));
 
                             if (retMap.containsKey(keyVal))
                                 // We already have a return value.
@@ -1823,7 +1823,7 @@ private  IgniteInternalFuture> checkMissed(
                                             val,
                                             skipVals,
                                             keepCacheObjects,
-                                            deserializePortable,
+                                            deserializeBinary,
                                             false);
                                     }
 
@@ -1847,7 +1847,7 @@ private  IgniteInternalFuture> checkMissed(
                             return checkMissed(cacheCtx,
                                 retMap,
                                 missed,
-                                deserializePortable,
+                                deserializeBinary,
                                 skipVals,
                                 keepCacheObjects,
                                 skipStore);
@@ -1913,7 +1913,7 @@ private  IgniteInternalFuture> checkMissed(
                     return checkMissed(cacheCtx,
                         retMap,
                         missed,
-                        deserializePortable,
+                        deserializeBinary,
                         skipVals,
                         keepCacheObjects,
                         skipStore);
@@ -3488,12 +3488,12 @@ private  IgniteInternalFuture nonInterruptable(IgniteInternalFuture fut
     }
 
     /**
-     * Checks if portable values should be deserialized.
+     * Checks if binary values should be deserialized.
      *
      * @param cacheCtx Cache context.
      * @return {@code True} if binary should be deserialized, {@code false} otherwise.
      */
-    private boolean deserializePortables(GridCacheContext cacheCtx) {
+    private boolean deserializeBinaries(GridCacheContext cacheCtx) {
         CacheOperationContext opCtx = cacheCtx.operationContextPerCall();
 
         return opCtx == null || !opCtx.isKeepBinary();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
index 24d880bfdf23c..a5d3373e8c41e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
@@ -64,7 +64,7 @@ public interface IgniteTxLocalEx extends IgniteInternalTx {
     /**
      * @param cacheCtx Cache context.
      * @param keys Keys to get.
-     * @param deserializePortable Deserialize portable flag.
+     * @param deserializeBinary Deserialize binary flag.
      * @param skipVals Skip values flag.
      * @param keepCacheObjects Keep cache objects
      * @param skipStore Skip store flag.
@@ -73,7 +73,7 @@ public interface IgniteTxLocalEx extends IgniteInternalTx {
     public  IgniteInternalFuture> getAllAsync(
         GridCacheContext cacheCtx,
         Collection keys,
-        boolean deserializePortable,
+        boolean deserializeBinary,
         boolean skipVals,
         boolean keepCacheObjects,
         boolean skipStore);
@@ -196,4 +196,4 @@ public IgniteInternalFuture loadMissing(
         boolean needVer,
         boolean keepBinary,
         GridInClosure3 c);
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
index 239b1b9497764..cadf1a95081da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
@@ -71,22 +71,22 @@ public interface IgniteCacheObjectProcessor extends GridProcessor {
     @Nullable public CacheObject prepareForCache(@Nullable CacheObject obj, GridCacheContext cctx);
 
     /**
-     * Checks whether object is portable object.
+     * Checks whether object is binary object.
      *
      * @param obj Object to check.
-     * @return {@code True} if object is already a portable object, {@code false} otherwise.
+     * @return {@code True} if object is already a binary object, {@code false} otherwise.
      */
-    public boolean isPortableObject(Object obj);
+    public boolean isBinaryObject(Object obj);
 
     /**
-     * Checks whether given class is portable.
+     * Checks whether given class is binary.
      *
-     * @return {@code true} If portable objects are enabled.
+     * @return {@code true} If binary objects are enabled.
      */
-    public boolean isPortableEnabled(CacheConfiguration ccfg);
+    public boolean isBinaryEnabled(CacheConfiguration ccfg);
 
     /**
-     * @param obj Portable object to get field from.
+     * @param obj Binary object to get field from.
      * @param fieldName Field name.
      * @return Field value.
      */
@@ -170,4 +170,4 @@ public interface IgniteCacheObjectProcessor extends GridProcessor {
      * @return Ignite binary interface.
      */
     public IgniteBinary binary();
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 0d36e0e579f25..5b764b68e1c98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -219,7 +219,7 @@ protected CacheObject toCacheObject0(@Nullable Object obj, boolean userObj) {
             ccfg.getAffinityMapper() != null ? ccfg.getAffinityMapper() : new GridCacheDefaultAffinityKeyMapper(),
             ccfg.isCopyOnRead() && memMode != OFFHEAP_VALUES,
             storeVal,
-            ctx.config().isPeerClassLoadingEnabled() && !isPortableEnabled(ccfg));
+            ctx.config().isPeerClassLoadingEnabled() && !isBinaryEnabled(ccfg));
 
         ctx.resource().injectGeneric(res.defaultAffMapper());
 
@@ -250,12 +250,12 @@ protected CacheObject toCacheObject0(@Nullable Object obj, boolean userObj) {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean isPortableObject(Object obj) {
+    @Override public boolean isBinaryObject(Object obj) {
         return false;
     }
 
     /** {@inheritDoc} */
-    @Override public boolean isPortableEnabled(CacheConfiguration ccfg) {
+    @Override public boolean isBinaryEnabled(CacheConfiguration ccfg) {
         return false;
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java
index 80e7b3999a808..c1c8fedb3f2f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java
@@ -44,7 +44,7 @@ public class NoOpBinary implements IgniteBinary {
     }
 
     /** {@inheritDoc} */
-    @Override public BinaryObjectBuilder builder(BinaryObject portableObj) throws BinaryObjectException {
+    @Override public BinaryObjectBuilder builder(BinaryObject binaryObj) throws BinaryObjectException {
         throw unsupported();
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
index 874d2e22ccf87..d1c0cc3301832 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
@@ -85,7 +85,7 @@ public DataStreamerEntry(KeyCacheObject key, CacheObject val) {
     public  Map.Entry toEntry(final GridCacheContext ctx, final boolean keepBinary) {
         return new Map.Entry() {
             @Override public K getKey() {
-                return (K)ctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepBinary, false);
+                return (K)ctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false);
             }
 
             @Override public V setValue(V val) {
@@ -93,7 +93,7 @@ public  Map.Entry toEntry(final GridCacheContext ctx, final boolean
             }
 
             @Override public V getValue() {
-                return (V)ctx.cacheObjectContext().unwrapPortableIfNeeded(val, keepBinary, false);
+                return (V)ctx.cacheObjectContext().unwrapBinaryIfNeeded(val, keepBinary, false);
             }
         };
     }
@@ -170,4 +170,4 @@ public  Map.Entry toEntry(final GridCacheContext ctx, final boolean
     @Override public String toString() {
         return S.toString(DataStreamerEntry.class, this);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractPredicate.java
index bcfe19ea24be9..fa792f9621c7e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractPredicate.java
@@ -26,7 +26,7 @@
  * Base interop predicate. Delegates apply to native platform.
  */
 public abstract class PlatformAbstractPredicate implements Externalizable {
-    /** .Net portable predicate */
+    /** .Net binary predicate */
     protected Object pred;
 
     /** Pointer to deployed predicate. */
@@ -45,7 +45,7 @@ public PlatformAbstractPredicate() {
     /**
      * Constructor.
      *
-     * @param pred .Net portable predicate.
+     * @param pred .Net binary predicate.
      * @param ptr Pointer to predicate in the native platform.
      * @param ctx Kernal context.
      */
@@ -64,4 +64,4 @@ protected PlatformAbstractPredicate(Object pred, long ptr, PlatformContext ctx)
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         pred = in.readObject();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
index 9c783aa10b82a..34a2cca55e284 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
@@ -229,7 +229,7 @@ protected IgniteFuture currentFuture() throws IgniteCheckedException {
      * Process IN operation.
      *
      * @param type Type.
-     * @param reader Portable reader.
+     * @param reader Binary reader.
      * @return Result.
      * @throws IgniteCheckedException In case of exception.
      */
@@ -241,8 +241,8 @@ protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws
      * Process IN-OUT operation.
      *
      * @param type Type.
-     * @param reader Portable reader.
-     * @param writer Portable writer.
+     * @param reader Binary reader.
+     * @param writer Binary writer.
      * @throws IgniteCheckedException In case of exception.
      */
     protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer)
@@ -254,7 +254,7 @@ protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, Bina
      * Process IN operation with managed object as result.
      *
      * @param type Type.
-     * @param reader Portable reader.
+     * @param reader Binary reader.
      * @return Result.
      * @throws IgniteCheckedException In case of exception.
      */
@@ -267,8 +267,8 @@ protected Object processInStreamOutObject(int type, BinaryRawReaderEx reader) th
      *
      * @param type Type.
      * @param arg Argument.
-     * @param reader Portable reader.
-     * @param writer Portable writer.
+     * @param reader Binary reader.
+     * @param writer Binary writer.
      * @throws IgniteCheckedException In case of exception.
      */
     protected void processInObjectStreamOutStream(int type, @Nullable Object arg, BinaryRawReaderEx reader,
@@ -290,7 +290,7 @@ protected long processOutLong(int type) throws IgniteCheckedException {
      * Process OUT operation.
      *
      * @param type Type.
-     * @param writer Portable writer.
+     * @param writer Binary writer.
      * @throws IgniteCheckedException In case of exception.
      */
     protected void processOutStream(int type, BinaryRawWriterEx writer) throws IgniteCheckedException {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
index b8f5912280a88..b05d331405e7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
@@ -260,10 +260,10 @@ public interface PlatformContext {
      *
      * @param rcv Native receiver.
      * @param ptr Pointer.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      * @return Stream receiver.
      */
-    public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepPortable);
+    public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepBinary);
 
     /**
      * Create cluster node filter.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
index f69ea3e2d1ec6..c5317181dcee3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
@@ -384,7 +384,7 @@ public PlatformContextImpl(GridKernalContext ctx, PlatformCallbackGateway gate,
     }
 
     /**
-     * Write portable metadata.
+     * Write binary metadata.
      *
      * @param writer Writer.
      * @param typeId Type id.
@@ -612,8 +612,8 @@ private void writeCommonEventData(BinaryRawWriterEx writer, EventAdapter evt) {
     }
 
     /** {@inheritDoc} */
-    @Override public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepPortable) {
-        return new PlatformStreamReceiverImpl(rcv, ptr, keepPortable, this);
+    @Override public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepBinary) {
+        return new PlatformStreamReceiverImpl(rcv, ptr, keepBinary, this);
     }
 
     /** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
index d49d3e270395d..914254358338c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
@@ -79,7 +79,7 @@ public PlatformNoopProcessor(GridKernalContext ctx) {
     }
 
     /** {@inheritDoc} */
-    @Override public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepPortable) throws IgniteCheckedException {
+    @Override public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepBinary) throws IgniteCheckedException {
         return null;
     }
 
@@ -119,7 +119,7 @@ public PlatformNoopProcessor(GridKernalContext ctx) {
     }
 
     /** {@inheritDoc} */
-    @Override public void registerStore(PlatformCacheStore store, boolean convertPortable)
+    @Override public void registerStore(PlatformCacheStore store, boolean convertBinary)
         throws IgniteCheckedException {
         // No-op.
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
index 5c6490f431a68..fa2295366037a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
@@ -102,11 +102,11 @@ public interface PlatformProcessor extends GridProcessor {
      * Get data streamer.
      *
      * @param cacheName Cache name.
-     * @param keepPortable Portable flag.
+     * @param keepBinary Binary flag.
      * @return Data streamer.
      * @throws IgniteCheckedException If failed.
      */
-    public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepPortable) throws IgniteCheckedException;
+    public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepBinary) throws IgniteCheckedException;
 
     /**
      * Get transactions.
@@ -166,10 +166,10 @@ public interface PlatformProcessor extends GridProcessor {
      * Register cache store.
      *
      * @param store Store.
-     * @param convertPortable Convert portable flag.
+     * @param convertBinary Convert binary flag.
      * @throws IgniteCheckedException If failed.
      */
-    public void registerStore(PlatformCacheStore store, boolean convertPortable) throws IgniteCheckedException;
+    public void registerStore(PlatformCacheStore store, boolean convertBinary) throws IgniteCheckedException;
 
     /**
      * Get or create AtomicLong.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index a788775d0089f..b0870bb8b73f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@ -136,7 +136,7 @@ public PlatformProcessorImpl(GridKernalContext ctx) {
 
         try {
             for (StoreInfo store : pendingStores)
-                registerStore0(store.store, store.convertPortable);
+                registerStore0(store.store, store.convertBinary);
 
             pendingStores.clear();
 
@@ -222,7 +222,7 @@ public void awaitStart() throws IgniteCheckedException {
         if (cache == null)
             throw new IllegalArgumentException("Cache doesn't exist: " + name);
 
-        return new PlatformCache(platformCtx, cache.keepPortable(), false);
+        return new PlatformCache(platformCtx, cache.keepBinary(), false);
     }
 
     /** {@inheritDoc} */
@@ -231,7 +231,7 @@ public void awaitStart() throws IgniteCheckedException {
 
         assert cache != null;
 
-        return new PlatformCache(platformCtx, cache.keepPortable(), false);
+        return new PlatformCache(platformCtx, cache.keepBinary(), false);
     }
 
     /** {@inheritDoc} */
@@ -240,7 +240,7 @@ public void awaitStart() throws IgniteCheckedException {
 
         assert cache != null;
 
-        return new PlatformCache(platformCtx, cache.keepPortable(), false);
+        return new PlatformCache(platformCtx, cache.keepBinary(), false);
     }
 
     /** {@inheritDoc} */
@@ -249,13 +249,13 @@ public void awaitStart() throws IgniteCheckedException {
     }
 
     /** {@inheritDoc} */
-    @Override public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepPortable)
+    @Override public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepBinary)
         throws IgniteCheckedException {
         IgniteDataStreamer ldr = ctx.dataStream().dataStreamer(cacheName);
 
         ldr.keepBinary(true);
 
-        return new PlatformDataStreamer(platformCtx, cacheName, (DataStreamerImpl)ldr, keepPortable);
+        return new PlatformDataStreamer(platformCtx, cacheName, (DataStreamerImpl)ldr, keepBinary);
     }
 
     /** {@inheritDoc} */
@@ -304,7 +304,7 @@ public void awaitStart() throws IgniteCheckedException {
     }
 
     /** {@inheritDoc} */
-    @Override public void registerStore(PlatformCacheStore store, boolean convertPortable)
+    @Override public void registerStore(PlatformCacheStore store, boolean convertBinary)
         throws IgniteCheckedException {
         storeLock.readLock().lock();
 
@@ -314,9 +314,9 @@ public void awaitStart() throws IgniteCheckedException {
                     store);
 
             if (started)
-                registerStore0(store, convertPortable);
+                registerStore0(store, convertBinary);
             else
-                pendingStores.add(new StoreInfo(store, convertPortable));
+                pendingStores.add(new StoreInfo(store, convertBinary));
         }
         finally {
             storeLock.readLock().unlock();
@@ -337,14 +337,14 @@ public void awaitStart() throws IgniteCheckedException {
      * Internal store initialization routine.
      *
      * @param store Store.
-     * @param convertPortable Convert portable flag.
+     * @param convertBinary Convert binary flag.
      * @throws IgniteCheckedException If failed.
      */
-    private void registerStore0(PlatformCacheStore store, boolean convertPortable) throws IgniteCheckedException {
+    private void registerStore0(PlatformCacheStore store, boolean convertBinary) throws IgniteCheckedException {
         if (store instanceof PlatformDotNetCacheStore) {
             PlatformDotNetCacheStore store0 = (PlatformDotNetCacheStore)store;
 
-            store0.initialize(ctx, convertPortable);
+            store0.initialize(ctx, convertBinary);
         }
         else
             throw new IgniteCheckedException("Unsupported interop store: " + store);
@@ -357,18 +357,18 @@ private static class StoreInfo {
         /** Store. */
         private final PlatformCacheStore store;
 
-        /** Convert portable flag. */
-        private final boolean convertPortable;
+        /** Convert binary flag. */
+        private final boolean convertBinary;
 
         /**
          * Constructor.
          *
          * @param store Store.
-         * @param convertPortable Convert portable flag.
+         * @param convertBinary Convert binary flag.
          */
-        private StoreInfo(PlatformCacheStore store, boolean convertPortable) {
+        private StoreInfo(PlatformCacheStore store, boolean convertBinary) {
             this.store = store;
-            this.convertPortable = convertPortable;
+            this.convertBinary = convertBinary;
         }
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index da7a15dbe45c2..2f7cab26a293b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -180,7 +180,7 @@ public class PlatformCache extends PlatformAbstractTarget {
     private final IgniteCacheProxy cache;
 
     /** Whether this cache is created with "keepBinary" flag on the other side. */
-    private final boolean keepPortable;
+    private final boolean keepBinary;
 
     /** */
     private static final GetAllWriter WRITER_GET_ALL = new GetAllWriter();
@@ -202,13 +202,13 @@ public class PlatformCache extends PlatformAbstractTarget {
      *
      * @param platformCtx Context.
      * @param cache Underlying cache.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      */
-    public PlatformCache(PlatformContext platformCtx, IgniteCache cache, boolean keepPortable) {
+    public PlatformCache(PlatformContext platformCtx, IgniteCache cache, boolean keepBinary) {
         super(platformCtx);
 
         this.cache = (IgniteCacheProxy)cache;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /**
@@ -220,16 +220,16 @@ public PlatformCache withSkipStore() {
         if (cache.delegate().skipStore())
             return this;
 
-        return new PlatformCache(platformCtx, cache.withSkipStore(), keepPortable);
+        return new PlatformCache(platformCtx, cache.withSkipStore(), keepBinary);
     }
 
     /**
-     * Gets cache with "keep portable" flag.
+     * Gets cache with "keep binary" flag.
      *
-     * @return Cache with "keep portable" flag set.
+     * @return Cache with "keep binary" flag set.
      */
-    public PlatformCache withKeepPortable() {
-        if (keepPortable)
+    public PlatformCache withKeepBinary() {
+        if (keepBinary)
             return this;
 
         return new PlatformCache(platformCtx, cache.withKeepBinary(), true);
@@ -246,7 +246,7 @@ public PlatformCache withKeepPortable() {
     public PlatformCache withExpiryPolicy(final long create, final long update, final long access) {
         IgniteCache cache0 = cache.withExpiryPolicy(new InteropExpiryPolicy(create, update, access));
 
-        return new PlatformCache(platformCtx, cache0, keepPortable);
+        return new PlatformCache(platformCtx, cache0, keepBinary);
     }
 
     /**
@@ -258,7 +258,7 @@ public PlatformCache withAsync() {
         if (cache.isAsync())
             return this;
 
-        return new PlatformCache(platformCtx, (IgniteCache)cache.withAsync(), keepPortable);
+        return new PlatformCache(platformCtx, (IgniteCache)cache.withAsync(), keepBinary);
     }
 
     /**
@@ -272,7 +272,7 @@ public PlatformCache withNoRetries() {
         if (opCtx != null && opCtx.noRetries())
             return this;
 
-        return new PlatformCache(platformCtx, cache.withNoRetries(), keepPortable);
+        return new PlatformCache(platformCtx, cache.withNoRetries(), keepBinary);
     }
 
     /** {@inheritDoc} */
@@ -623,10 +623,10 @@ private void loadCache0(BinaryRawReaderEx reader, boolean loc) {
     @Override public Exception convertException(Exception e) {
         if (e instanceof CachePartialUpdateException)
             return new PlatformCachePartialUpdateException((CachePartialUpdateCheckedException)e.getCause(),
-                platformCtx, keepPortable);
+                platformCtx, keepBinary);
 
         if (e instanceof CachePartialUpdateCheckedException)
-            return new PlatformCachePartialUpdateException((CachePartialUpdateCheckedException)e, platformCtx, keepPortable);
+            return new PlatformCachePartialUpdateException((CachePartialUpdateCheckedException)e, platformCtx, keepBinary);
 
         if (e.getCause() instanceof EntryProcessorException)
             return (EntryProcessorException) e.getCause();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
index d027a9a507890..4c86d6df15a2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
@@ -43,7 +43,7 @@ public PlatformCacheEntryFilterImpl() {
     /**
      * Constructor.
      *
-     * @param pred .Net portable predicate.
+     * @param pred .Net binary predicate.
      * @param ptr Pointer to predicate in the native platform.
      * @param ctx Kernal context.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
index 3986a13fbf76f..3e8ad6148e0d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
@@ -52,13 +52,13 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces
     /** Indicates that remove has been called on an entry  */
     private static final byte ENTRY_STATE_REMOVED = 2;
 
-    /** Indicates error in processor that is written as portable.  */
-    private static final byte ENTRY_STATE_ERR_PORTABLE = 3;
+    /** Indicates error in processor that is written as binary.  */
+    private static final byte ENTRY_STATE_ERR_BINARY = 3;
 
     /** Indicates error in processor that is written as string.  */
     private static final byte ENTRY_STATE_ERR_STRING = 4;
 
-    /** Native portable processor */
+    /** Native binary processor */
     private Object proc;
 
     /** Pointer to processor in the native platform. */
@@ -74,7 +74,7 @@ public PlatformCacheEntryProcessorImpl() {
     /**
      * Constructor.
      *
-     * @param proc Native portable processor
+     * @param proc Native binary processor
      * @param ptr Pointer to processor in the native platform.
      */
     public PlatformCacheEntryProcessorImpl(Object proc, long ptr) {
@@ -184,7 +184,7 @@ private Object readResultAndUpdateEntry(PlatformContext ctx, MutableEntry entry,
 
                 break;
 
-            case ENTRY_STATE_ERR_PORTABLE:
+            case ENTRY_STATE_ERR_BINARY:
                 // Full exception
                 Object nativeErr = reader.readObjectDetached();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java
index 8cb1490173825..c3cc43477f3c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java
@@ -32,27 +32,27 @@ public class PlatformCachePartialUpdateException extends PlatformExtendedExcepti
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** Keep portable flag. */
-    private final boolean keepPortable;
+    /** Keep binary flag. */
+    private final boolean keepBinary;
 
     /**
      * Constructor.
      *
      * @param cause Root cause.
      * @param ctx Context.
-     * @param keepPortable Keep portable flag.
+     * @param keepBinary Keep binary flag.
      */
     public PlatformCachePartialUpdateException(CachePartialUpdateCheckedException cause, PlatformContext ctx,
-        boolean keepPortable) {
+        boolean keepBinary) {
         super(cause, ctx);
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /** {@inheritDoc} */
     @Override public void writeData(BinaryRawWriterEx writer) {
         Collection keys = ((CachePartialUpdateCheckedException)getCause()).failedKeys();
 
-        writer.writeBoolean(keepPortable);
+        writer.writeBoolean(keepBinary);
 
         PlatformUtils.writeNullableCollection(writer, keys);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index 5d5cdb8394dad..47862a226ac97 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -426,13 +426,13 @@ public void dataStreamerTopologyUpdate(long ptr, long topVer, int topSize) {
      * @param ptr Receiver native pointer.
      * @param cache Cache object.
      * @param memPtr Stream pointer.
-     * @param keepPortable Portable flag.
+     * @param keepBinary Binary flag.
      */
-    public void dataStreamerStreamReceiverInvoke(long ptr, Object cache, long memPtr, boolean keepPortable) {
+    public void dataStreamerStreamReceiverInvoke(long ptr, Object cache, long memPtr, boolean keepBinary) {
         enter();
 
         try {
-            PlatformCallbackUtils.dataStreamerStreamReceiverInvoke(envPtr, ptr, cache, memPtr, keepPortable);
+            PlatformCallbackUtils.dataStreamerStreamReceiverInvoke(envPtr, ptr, cache, memPtr, keepBinary);
         }
         finally {
             leave();
@@ -940,4 +940,4 @@ protected void leave() {
     protected void block() {
         lock.block();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
index 64749eab286ac..7f3ba6fff3ce2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
@@ -223,10 +223,10 @@ public class PlatformCallbackUtils {
      * @param ptr Receiver native pointer.
      * @param cache Cache object.
      * @param memPtr Stream pointer.
-     * @param keepPortable Portable flag.
+     * @param keepBinary Binary flag.
      */
     static native void dataStreamerStreamReceiverInvoke(long envPtr, long ptr, Object cache, long memPtr,
-        boolean keepPortable);
+        boolean keepBinary);
 
     /**
      * Notify future with byte result.
@@ -487,4 +487,4 @@ static native void dataStreamerStreamReceiverInvoke(long envPtr, long ptr, Objec
     private PlatformCallbackUtils() {
         // No-op.
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
index 72e4a71cf8810..bebff8e45e7f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
@@ -44,7 +44,7 @@ public PlatformClusterNodeFilterImpl() {
     /**
      * Constructor.
      *
-     * @param pred .Net portable predicate.
+     * @param pred .Net binary predicate.
      * @param ctx Kernal context.
      */
     public PlatformClusterNodeFilterImpl(Object pred, PlatformContext ctx) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
index 3cb65b9e30197..9ef6b5ea64f1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
@@ -258,7 +258,7 @@ private void executeNative0(final PlatformAbstractTask task) {
      */
     protected Object executeJavaTask(BinaryRawReaderEx reader, boolean async) {
         String taskName = reader.readString();
-        boolean keepPortable = reader.readBoolean();
+        boolean keepBinary = reader.readBoolean();
         Object arg = reader.readObjectDetached();
 
         Collection nodeIds = readNodeIds(reader);
@@ -268,7 +268,7 @@ protected Object executeJavaTask(BinaryRawReaderEx reader, boolean async) {
         if (async)
             compute0 = compute0.withAsync();
 
-        if (!keepPortable && arg instanceof BinaryObjectImpl)
+        if (!keepBinary && arg instanceof BinaryObjectImpl)
             arg = ((BinaryObject)arg).deserialize();
 
         Object res = compute0.execute(taskName, arg);
@@ -278,23 +278,23 @@ protected Object executeJavaTask(BinaryRawReaderEx reader, boolean async) {
                 private static final long serialVersionUID = 0L;
 
                 @Override public Object apply(IgniteFuture fut) {
-                    return toPortable(fut.get());
+                    return toBinary(fut.get());
                 }
             }));
 
             return null;
         }
         else
-            return toPortable(res);
+            return toBinary(res);
     }
 
     /**
-     * Convert object to portable form.
+     * Convert object to binary form.
      *
      * @param src Source object.
      * @return Result.
      */
-    private Object toPortable(Object src) {
+    private Object toBinary(Object src) {
         return platformCtx.kernalContext().grid().binary().toBinary(src);
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
index 82c3e59890a4c..07ef4f27d2a7b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
@@ -65,8 +65,8 @@ public class PlatformDataStreamer extends PlatformAbstractTarget {
     /** Data streamer. */
     private final DataStreamerImpl ldr;
 
-    /** Portable flag. */
-    private final boolean keepPortable;
+    /** Binary flag. */
+    private final boolean keepBinary;
 
     /** Topology update event listener. */
     private volatile GridLocalEventListener lsnr;
@@ -78,12 +78,12 @@ public class PlatformDataStreamer extends PlatformAbstractTarget {
      * @param ldr Data streamer.
      */
     public PlatformDataStreamer(PlatformContext platformCtx, String cacheName, DataStreamerImpl ldr,
-        boolean keepPortable) {
+        boolean keepBinary) {
         super(platformCtx);
 
         this.cacheName = cacheName;
         this.ldr = ldr;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /** {@inheritDoc}  */
@@ -131,7 +131,7 @@ else if (plc == PLC_FLUSH)
 
                 Object rec = reader.readObjectDetached();
 
-                ldr.receiver(platformCtx.createStreamReceiver(rec, ptr, keepPortable));
+                ldr.receiver(platformCtx.createStreamReceiver(rec, ptr, keepBinary));
 
                 return TRUE;
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
index 2a3848a0b5057..add11ed2ea6e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
@@ -43,7 +43,7 @@ public class PlatformStreamReceiverImpl extends PlatformAbstractPredicate implem
     private static final long serialVersionUID = 0L;
 
     /** */
-    private boolean keepPortable;
+    private boolean keepBinary;
 
     /**
      * Constructor.
@@ -56,16 +56,16 @@ public PlatformStreamReceiverImpl()
     /**
      * Constructor.
      *
-     * @param pred .Net portable receiver.
+     * @param pred .Net binary receiver.
      * @param ptr Pointer to receiver in the native platform.
      * @param ctx Kernal context.
      */
-    public PlatformStreamReceiverImpl(Object pred, long ptr, boolean keepPortable, PlatformContext ctx) {
+    public PlatformStreamReceiverImpl(Object pred, long ptr, boolean keepBinary, PlatformContext ctx) {
         super(pred, ptr, ctx);
 
         assert pred != null;
 
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /** {@inheritDoc} */
@@ -89,8 +89,8 @@ public PlatformStreamReceiverImpl(Object pred, long ptr, boolean keepPortable, P
 
             out.synchronize();
 
-            ctx.gateway().dataStreamerStreamReceiverInvoke(ptr, new PlatformCache(ctx, cache, keepPortable),
-                mem.pointer(), keepPortable);
+            ctx.gateway().dataStreamerStreamReceiverInvoke(ptr, new PlatformCache(ctx, cache, keepBinary),
+                mem.pointer(), keepBinary);
         }
     }
 
@@ -107,13 +107,13 @@ public void setIgniteInstance(Ignite ignite) {
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         super.writeExternal(out);
 
-        out.writeBoolean(keepPortable);
+        out.writeBoolean(keepBinary);
     }
 
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         super.readExternal(in);
 
-        keepPortable = in.readBoolean();
+        keepBinary = in.readBoolean();
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
index c41ca6ec3fde3..7e65c22b68adb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
@@ -318,10 +318,10 @@ public void setProperties(Map props) {
      * Initialize the store.
      *
      * @param ctx Context.
-     * @param convertPortable Convert portable flag.
+     * @param convertBinary Convert binary flag.
      * @throws org.apache.ignite.IgniteCheckedException
      */
-    public void initialize(GridKernalContext ctx, boolean convertPortable) throws IgniteCheckedException {
+    public void initialize(GridKernalContext ctx, boolean convertBinary) throws IgniteCheckedException {
         A.notNull(typName, "typName");
 
         platformCtx = PlatformUtils.platformContext(ctx.grid());
@@ -331,7 +331,7 @@ public void initialize(GridKernalContext ctx, boolean convertPortable) throws Ig
 
             BinaryRawWriterEx writer = platformCtx.writer(out);
 
-            write(writer, convertPortable);
+            write(writer, convertBinary);
 
             out.synchronize();
 
@@ -343,11 +343,11 @@ public void initialize(GridKernalContext ctx, boolean convertPortable) throws Ig
      * Write store data to a stream.
      *
      * @param writer Writer.
-     * @param convertPortable Convert portable flag.
+     * @param convertBinary Convert binary flag.
      */
-    protected void write(BinaryRawWriterEx writer, boolean convertPortable) {
+    protected void write(BinaryRawWriterEx writer, boolean convertBinary) {
         writer.writeString(typName);
-        writer.writeBoolean(convertPortable);
+        writer.writeBoolean(convertBinary);
         writer.writeMap(props);
     }
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
index b2bd5d4514896..4ac3536ca2080 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
@@ -234,7 +234,7 @@ private static List beans(IgniteConfiguration cfg)
     }
 
     /**
-     * Create portable marshaller.
+     * Create binary marshaller.
      *
      * @return Marshaller.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java
index ec241ee33f23b..1eb9a2c0605bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java
@@ -39,9 +39,9 @@ public PlatformDotNetServiceImpl() {
      *
      * @param svc Service.
      * @param ctx Context.
-     * @param srvKeepPortable Whether to keep objects portable on server if possible.
+     * @param srvKeepBinary Whether to keep objects binary on server if possible.
      */
-    public PlatformDotNetServiceImpl(Object svc, PlatformContext ctx, boolean srvKeepPortable) {
-        super(svc, ctx, srvKeepPortable);
+    public PlatformDotNetServiceImpl(Object svc, PlatformContext ctx, boolean srvKeepBinary) {
+        super(svc, ctx, srvKeepBinary);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
index 624870a1701f4..fffa772d25be2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
@@ -79,7 +79,7 @@ public PlatformEventFilterListenerImpl(long hnd, PlatformContext ctx) {
     /**
      * Constructor.
      *
-     * @param pred .Net portable predicate.
+     * @param pred .Net binary predicate.
      */
     public PlatformEventFilterListenerImpl(Object pred, final int... types) {
         assert pred != null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
index a737442ac7738..b8451eef8748f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
@@ -46,7 +46,7 @@ public PlatformMessageFilterImpl()
     /**
      * Constructor.
      *
-     * @param pred .Net portable predicate.
+     * @param pred .Net binary predicate.
      * @param ptr Pointer to predicate in the native platform.
      * @param ctx Kernal context.
      */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
index 6d143aa38bed0..08402753e11af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
@@ -41,11 +41,11 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** .Net portable service. */
+    /** .Net binary service. */
     protected Object svc;
 
-    /** Whether to keep objects portable on server if possible. */
-    protected boolean srvKeepPortable;
+    /** Whether to keep objects binary on server if possible. */
+    protected boolean srvKeepBinary;
 
     /** Pointer to deployed service. */
     protected transient long ptr;
@@ -65,15 +65,15 @@ public PlatformAbstractService() {
      *
      * @param svc Service.
      * @param ctx Context.
-     * @param srvKeepPortable Whether to keep objects portable on server if possible.
+     * @param srvKeepBinary Whether to keep objects binary on server if possible.
      */
-    public PlatformAbstractService(Object svc, PlatformContext ctx, boolean srvKeepPortable) {
+    public PlatformAbstractService(Object svc, PlatformContext ctx, boolean srvKeepBinary) {
         assert svc != null;
         assert ctx != null;
 
         this.svc = svc;
         this.platformCtx = ctx;
-        this.srvKeepPortable = srvKeepPortable;
+        this.srvKeepBinary = srvKeepBinary;
     }
 
     /** {@inheritDoc} */
@@ -86,7 +86,7 @@ public PlatformAbstractService(Object svc, PlatformContext ctx, boolean srvKeepP
 
             BinaryRawWriterEx writer = platformCtx.writer(out);
 
-            writer.writeBoolean(srvKeepPortable);
+            writer.writeBoolean(srvKeepBinary);
             writer.writeObject(svc);
 
             writeServiceContext(ctx, writer);
@@ -110,7 +110,7 @@ public PlatformAbstractService(Object svc, PlatformContext ctx, boolean srvKeepP
 
             BinaryRawWriterEx writer = platformCtx.writer(out);
 
-            writer.writeBoolean(srvKeepPortable);
+            writer.writeBoolean(srvKeepBinary);
 
             writeServiceContext(ctx, writer);
 
@@ -133,7 +133,7 @@ public PlatformAbstractService(Object svc, PlatformContext ctx, boolean srvKeepP
 
             BinaryRawWriterEx writer = platformCtx.writer(out);
 
-            writer.writeBoolean(srvKeepPortable);
+            writer.writeBoolean(srvKeepBinary);
 
             writeServiceContext(ctx, writer);
 
@@ -168,7 +168,7 @@ private void writeServiceContext(ServiceContext ctx, BinaryRawWriterEx writer) {
     }
 
     /** {@inheritDoc} */
-    @Override public Object invokeMethod(String mthdName, boolean srvKeepPortable, Object[] args)
+    @Override public Object invokeMethod(String mthdName, boolean srvKeepBinary, Object[] args)
         throws IgniteCheckedException {
         assert ptr != 0;
         assert platformCtx != null;
@@ -177,7 +177,7 @@ private void writeServiceContext(ServiceContext ctx, BinaryRawWriterEx writer) {
             PlatformOutputStream out = outMem.output();
             BinaryRawWriterEx writer = platformCtx.writer(out);
 
-            writer.writeBoolean(srvKeepPortable);
+            writer.writeBoolean(srvKeepBinary);
             writer.writeString(mthdName);
 
             if (args == null)
@@ -219,12 +219,12 @@ public void setIgniteInstance(Ignite ignite) {
     /** {@inheritDoc} */
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         svc = in.readObject();
-        srvKeepPortable = in.readBoolean();
+        srvKeepBinary = in.readBoolean();
     }
 
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         out.writeObject(svc);
-        out.writeBoolean(srvKeepPortable);
+        out.writeBoolean(srvKeepBinary);
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
index a6d9216d3f662..2d6e1cc83de8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
@@ -28,12 +28,12 @@ public interface PlatformService extends Service {
      * Invokes native service method.
      *
      * @param mthdName Method name.
-     * @param srvKeepPortable Server keep portable flag.
+     * @param srvKeepBinary Server keep binary flag.
      * @param args Arguments.
      * @return Resulting data.
      * @throws org.apache.ignite.IgniteCheckedException If failed.
      */
-    public Object invokeMethod(String mthdName, boolean srvKeepPortable, Object[] args) throws IgniteCheckedException;
+    public Object invokeMethod(String mthdName, boolean srvKeepBinary, Object[] args) throws IgniteCheckedException;
 
     /**
      * Gets native pointer.
@@ -41,4 +41,4 @@ public interface PlatformService extends Service {
      * @return Native pointer.
      */
     public long pointer();
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
index ff093570f4b84..9676b6f01f478 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
@@ -60,23 +60,23 @@ public class PlatformServices extends PlatformAbstractTarget {
     /** */
     private final IgniteServices services;
 
-    /** Server keep portable flag. */
-    private final boolean srvKeepPortable;
+    /** Server keep binary flag. */
+    private final boolean srvKeepBinary;
 
     /**
      * Ctor.
      *
      * @param platformCtx Context.
      * @param services Services facade.
-     * @param srvKeepPortable Server keep portable flag.
+     * @param srvKeepBinary Server keep binary flag.
      */
-    public PlatformServices(PlatformContext platformCtx, IgniteServices services, boolean srvKeepPortable) {
+    public PlatformServices(PlatformContext platformCtx, IgniteServices services, boolean srvKeepBinary) {
         super(platformCtx);
 
         assert services != null;
 
         this.services = services;
-        this.srvKeepPortable = srvKeepPortable;
+        this.srvKeepBinary = srvKeepBinary;
     }
 
     /**
@@ -88,16 +88,16 @@ public PlatformServices withAsync() {
         if (services.isAsync())
             return this;
 
-        return new PlatformServices(platformCtx, services.withAsync(), srvKeepPortable);
+        return new PlatformServices(platformCtx, services.withAsync(), srvKeepBinary);
     }
 
     /**
-     * Gets services with server "keep portable" mode enabled.
+     * Gets services with server "keep binary" mode enabled.
      *
-     * @return Services with server "keep portable" mode enabled.
+     * @return Services with server "keep binary" mode enabled.
      */
-    public PlatformServices withServerKeepPortable() {
-        return srvKeepPortable ? this : new PlatformServices(platformCtx, services, true);
+    public PlatformServices withServerKeepBinary() {
+        return srvKeepBinary ? this : new PlatformServices(platformCtx, services, true);
     }
 
     /**
@@ -135,7 +135,7 @@ public Object dotNetServiceProxy(String name, boolean sticky) {
                 ServiceConfiguration cfg = new ServiceConfiguration();
 
                 cfg.setName(reader.readString());
-                cfg.setService(new PlatformDotNetServiceImpl(reader.readObjectDetached(), platformCtx, srvKeepPortable));
+                cfg.setService(new PlatformDotNetServiceImpl(reader.readObjectDetached(), platformCtx, srvKeepBinary));
                 cfg.setTotalCount(reader.readInt());
                 cfg.setMaxPerNodeCount(reader.readInt());
                 cfg.setCacheName(reader.readString());
@@ -157,7 +157,7 @@ public Object dotNetServiceProxy(String name, boolean sticky) {
                 int totalCnt = reader.readInt();
                 int maxPerNodeCnt = reader.readInt();
 
-                services.deployMultiple(name, new PlatformDotNetServiceImpl(svc, platformCtx, srvKeepPortable),
+                services.deployMultiple(name, new PlatformDotNetServiceImpl(svc, platformCtx, srvKeepBinary),
                     totalCnt, maxPerNodeCnt);
 
                 return TRUE;
@@ -218,7 +218,7 @@ public Object dotNetServiceProxy(String name, boolean sticky) {
                     args = null;
 
                 try {
-                    Object result = ((PlatformDotNetService)arg).invokeMethod(mthdName, srvKeepPortable, args);
+                    Object result = ((PlatformDotNetService)arg).invokeMethod(mthdName, srvKeepBinary, args);
 
                     PlatformUtils.writeInvocationResult(writer, result, null);
                 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
index b25538bc10d0d..b006c75ccac32 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
@@ -24,7 +24,7 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
- * Deserializes portable objects if needed.
+ * Deserializes binary objects if needed.
  */
 public class GridQueryCacheObjectsIterator implements Iterator>, AutoCloseable {
     /** */
@@ -34,17 +34,17 @@ public class GridQueryCacheObjectsIterator implements Iterator>, AutoClo
     private final GridCacheContext cctx;
 
     /** */
-    private final boolean keepPortable;
+    private final boolean keepBinary;
 
     /**
      * @param iter Iterator.
      * @param cctx Cache context.
-     * @param keepPortable Keep portable.
+     * @param keepBinary Keep binary.
      */
-    public GridQueryCacheObjectsIterator(Iterator> iter, GridCacheContext cctx, boolean keepPortable) {
+    public GridQueryCacheObjectsIterator(Iterator> iter, GridCacheContext cctx, boolean keepBinary) {
         this.iter = iter;
         this.cctx = cctx;
-        this.keepPortable = keepPortable;
+        this.keepBinary = keepBinary;
     }
 
     /** {@inheritDoc} */
@@ -61,11 +61,11 @@ public GridQueryCacheObjectsIterator(Iterator> iter, GridCacheContext next() {
-        return (List)cctx.unwrapPortablesIfNeeded((Collection)iter.next(), keepPortable);
+        return (List)cctx.unwrapBinariesIfNeeded((Collection)iter.next(), keepBinary);
     }
 
     /** {@inheritDoc} */
     @Override public void remove() {
         iter.remove();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 005f617206b1e..0412b4c09b559 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -209,7 +209,7 @@ public void initializeCache(CacheConfiguration ccfg) throws IgniteCheckedE
 
                     desc.name(simpleValType);
 
-                    if (ctx.cacheObjects().isPortableEnabled(ccfg)) {
+                    if (ctx.cacheObjects().isBinaryEnabled(ccfg)) {
                         // Safe to check null.
                         if (SQL_TYPES.contains(valCls))
                             desc.valueClass(valCls);
@@ -237,8 +237,8 @@ public void initializeCache(CacheConfiguration ccfg) throws IgniteCheckedE
                     TypeId typeId;
                     TypeId altTypeId = null;
 
-                    if (valCls == null || ctx.cacheObjects().isPortableEnabled(ccfg)) {
-                        processPortableMeta(qryEntity, desc);
+                    if (valCls == null || ctx.cacheObjects().isBinaryEnabled(ccfg)) {
+                        processBinaryMeta(qryEntity, desc);
 
                         typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(qryEntity.getValueType()));
 
@@ -281,7 +281,7 @@ public void initializeCache(CacheConfiguration ccfg) throws IgniteCheckedE
 
                     desc.name(meta.getSimpleValueType());
 
-                    if (ctx.cacheObjects().isPortableEnabled(ccfg)) {
+                    if (ctx.cacheObjects().isBinaryEnabled(ccfg)) {
                         // Safe to check null.
                         if (SQL_TYPES.contains(valCls))
                             desc.valueClass(valCls);
@@ -301,8 +301,8 @@ public void initializeCache(CacheConfiguration ccfg) throws IgniteCheckedE
                     TypeId typeId;
                     TypeId altTypeId = null;
 
-                    if (valCls == null || ctx.cacheObjects().isPortableEnabled(ccfg)) {
-                        processPortableMeta(meta, desc);
+                    if (valCls == null || ctx.cacheObjects().isBinaryEnabled(ccfg)) {
+                        processBinaryMeta(meta, desc);
 
                         typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(meta.getValueType()));
 
@@ -586,9 +586,9 @@ public void store(final String space, final CacheObject key, final CacheObject v
 
             TypeId id;
 
-            boolean portableVal = ctx.cacheObjects().isPortableObject(val);
+            boolean binaryVal = ctx.cacheObjects().isBinaryObject(val);
 
-            if (portableVal) {
+            if (binaryVal) {
                 int typeId = ctx.cacheObjects().typeId(val);
 
                 id = new TypeId(space, typeId);
@@ -604,12 +604,12 @@ public void store(final String space, final CacheObject key, final CacheObject v
             if (desc == null || !desc.registered())
                 return;
 
-            if (!portableVal && !desc.valueClass().isAssignableFrom(valCls))
+            if (!binaryVal && !desc.valueClass().isAssignableFrom(valCls))
                 throw new IgniteCheckedException("Failed to update index due to class name conflict" +
                     "(multiple classes with same simple name are stored in the same cache) " +
                     "[expCls=" + desc.valueClass().getName() + ", actualCls=" + valCls.getName() + ']');
 
-            if (!ctx.cacheObjects().isPortableObject(key)) {
+            if (!ctx.cacheObjects().isBinaryObject(key)) {
                 Class keyCls = key.value(coctx, false).getClass();
 
                 if (!desc.keyClass().isAssignableFrom(keyCls))
@@ -697,7 +697,7 @@ public Iterable> queryTwoStep(String space, final GridCacheTwoStepQuery
                     return idx.queryTwoStep(
                         cctx,
                         qry,
-                        cctx.keepPortable());
+                        cctx.keepBinary());
                 }
             }, false);
         }
@@ -870,7 +870,7 @@ public QueryCursor> queryLocalFields(final GridCacheContext cctx, f
             throw new IllegalStateException("Failed to execute query (grid is stopping).");
 
         try {
-            final boolean keepPortable = cctx.keepPortable();
+            final boolean keepBinary = cctx.keepBinary();
 
             return executeQuery(cctx, new IgniteOutClosureX>>() {
                 @Override public QueryCursor> applyx() throws IgniteCheckedException {
@@ -885,7 +885,7 @@ public QueryCursor> queryLocalFields(final GridCacheContext cctx, f
 
                     QueryCursorImpl> cursor = new QueryCursorImpl<>(new Iterable>() {
                         @Override public Iterator> iterator() {
-                            return new GridQueryCacheObjectsIterator(res.iterator(), cctx, keepPortable);
+                            return new GridQueryCacheObjectsIterator(res.iterator(), cctx, keepBinary);
                         }
                     });
 
@@ -1304,13 +1304,13 @@ private void addToIndex(
     }
 
     /**
-     * Processes declarative metadata for portable object.
+     * Processes declarative metadata for binary object.
      *
      * @param meta Declared metadata.
      * @param d Type descriptor.
      * @throws IgniteCheckedException If failed.
      */
-    private void processPortableMeta(CacheTypeMetadata meta, TypeDescriptor d)
+    private void processBinaryMeta(CacheTypeMetadata meta, TypeDescriptor d)
         throws IgniteCheckedException {
         Map aliases = meta.getAliases();
 
@@ -1318,7 +1318,7 @@ private void processPortableMeta(CacheTypeMetadata meta, TypeDescriptor d)
             aliases = Collections.emptyMap();
 
         for (Map.Entry> entry : meta.getAscendingFields().entrySet()) {
-            PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue(), aliases);
+            BinaryProperty prop = buildBinaryProperty(entry.getKey(), entry.getValue(), aliases);
 
             d.addProperty(prop, false);
 
@@ -1330,7 +1330,7 @@ private void processPortableMeta(CacheTypeMetadata meta, TypeDescriptor d)
         }
 
         for (Map.Entry> entry : meta.getDescendingFields().entrySet()) {
-            PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue(), aliases);
+            BinaryProperty prop = buildBinaryProperty(entry.getKey(), entry.getValue(), aliases);
 
             d.addProperty(prop, false);
 
@@ -1342,7 +1342,7 @@ private void processPortableMeta(CacheTypeMetadata meta, TypeDescriptor d)
         }
 
         for (String txtIdx : meta.getTextFields()) {
-            PortableProperty prop = buildPortableProperty(txtIdx, String.class, aliases);
+            BinaryProperty prop = buildBinaryProperty(txtIdx, String.class, aliases);
 
             d.addProperty(prop, false);
 
@@ -1360,7 +1360,7 @@ private void processPortableMeta(CacheTypeMetadata meta, TypeDescriptor d)
                 int order = 0;
 
                 for (Map.Entry, Boolean>> idxField : idxFields.entrySet()) {
-                    PortableProperty prop = buildPortableProperty(idxField.getKey(), idxField.getValue().get1(), aliases);
+                    BinaryProperty prop = buildBinaryProperty(idxField.getKey(), idxField.getValue().get1(), aliases);
 
                     d.addProperty(prop, false);
 
@@ -1374,7 +1374,7 @@ private void processPortableMeta(CacheTypeMetadata meta, TypeDescriptor d)
         }
 
         for (Map.Entry> entry : meta.getQueryFields().entrySet()) {
-            PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue(), aliases);
+            BinaryProperty prop = buildBinaryProperty(entry.getKey(), entry.getValue(), aliases);
 
             if (!d.props.containsKey(prop.name()))
                 d.addProperty(prop, false);
@@ -1382,20 +1382,20 @@ private void processPortableMeta(CacheTypeMetadata meta, TypeDescriptor d)
     }
 
     /**
-     * Processes declarative metadata for portable object.
+     * Processes declarative metadata for binary object.
      *
      * @param qryEntity Declared metadata.
      * @param d Type descriptor.
      * @throws IgniteCheckedException If failed.
      */
-    private void processPortableMeta(QueryEntity qryEntity, TypeDescriptor d) throws IgniteCheckedException {
+    private void processBinaryMeta(QueryEntity qryEntity, TypeDescriptor d) throws IgniteCheckedException {
         Map aliases = qryEntity.getAliases();
 
         if (aliases == null)
             aliases = Collections.emptyMap();
 
         for (Map.Entry entry : qryEntity.getFields().entrySet()) {
-            PortableProperty prop = buildPortableProperty(entry.getKey(), U.classForName(entry.getValue(), Object.class), aliases);
+            BinaryProperty prop = buildBinaryProperty(entry.getKey(), U.classForName(entry.getValue(), Object.class), aliases);
 
             d.addProperty(prop, false);
         }
@@ -1404,7 +1404,7 @@ private void processPortableMeta(QueryEntity qryEntity, TypeDescriptor d) throws
     }
 
     /**
-     * Processes declarative metadata for portable object.
+     * Processes declarative metadata for binary object.
      *
      * @param qryEntity Declared metadata.
      * @param d Type descriptor.
@@ -1485,18 +1485,18 @@ private void processIndexes(QueryEntity qryEntity, TypeDescriptor d) throws Igni
     }
 
     /**
-     * Builds portable object property.
+     * Builds binary object property.
      *
      * @param pathStr String representing path to the property. May contains dots '.' to identify
      *      nested fields.
      * @param resType Result type.
      * @param aliases Aliases.
-     * @return Portable property.
+     * @return Binary property.
      */
-    private PortableProperty buildPortableProperty(String pathStr, Class resType, Map aliases) {
+    private BinaryProperty buildBinaryProperty(String pathStr, Class resType, Map aliases) {
         String[] path = pathStr.split("\\.");
 
-        PortableProperty res = null;
+        BinaryProperty res = null;
 
         StringBuilder fullName = new StringBuilder();
 
@@ -1508,7 +1508,7 @@ private PortableProperty buildPortableProperty(String pathStr, Class resType,
 
             String alias = aliases.get(fullName.toString());
 
-            res = new PortableProperty(prop, res, resType, alias);
+            res = new BinaryProperty(prop, res, resType, alias);
         }
 
         return res;
@@ -1532,7 +1532,7 @@ private static ClassProperty buildClassProperty(Class keyCls, Class valCls
             resType,
             aliases);
 
-        if (res == null) // We check key before value consistently with PortableProperty.
+        if (res == null) // We check key before value consistently with BinaryProperty.
             res = buildClassProperty(false, valCls, pathStr, resType, aliases);
 
         if (res == null)
@@ -1812,7 +1812,7 @@ public boolean knowsClass(Class cls) {
     /**
      *
      */
-    private class PortableProperty extends GridQueryProperty {
+    private class BinaryProperty extends GridQueryProperty {
         /** Property name. */
         private String propName;
 
@@ -1820,7 +1820,7 @@ private class PortableProperty extends GridQueryProperty {
         private String alias;
 
         /** Parent property. */
-        private PortableProperty parent;
+        private BinaryProperty parent;
 
         /** Result class. */
         private Class type;
@@ -1841,7 +1841,7 @@ private class PortableProperty extends GridQueryProperty {
          * @param parent Parent property.
          * @param type Result type.
          */
-        private PortableProperty(String propName, PortableProperty parent, Class type, String alias) {
+        private BinaryProperty(String propName, BinaryProperty parent, Class type, String alias) {
             this.propName = propName;
             this.alias = F.isEmpty(alias) ? propName : alias;
             this.parent = parent;
@@ -1858,15 +1858,15 @@ private PortableProperty(String propName, PortableProperty parent, Class type
                 if (obj == null)
                     return null;
 
-                if (!ctx.cacheObjects().isPortableObject(obj))
-                    throw new IgniteCheckedException("Non-portable object received as a result of property extraction " +
+                if (!ctx.cacheObjects().isBinaryObject(obj))
+                    throw new IgniteCheckedException("Non-binary object received as a result of property extraction " +
                         "[parent=" + parent + ", propName=" + propName + ", obj=" + obj + ']');
             }
             else {
                 int isKeyProp0 = isKeyProp;
 
                 if (isKeyProp0 == 0) {
-                    // Key is allowed to be a non-portable object here.
+                    // Key is allowed to be a non-binary object here.
                     // We check key before value consistently with ClassProperty.
                     if (key instanceof BinaryObject && ((BinaryObject)key).hasField(propName))
                         isKeyProp = isKeyProp0 = 1;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
index daa056b55b9ab..f1fd99c627d88 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.internal.util.typedef.internal.S;
 
 /**
- * Portable meta data sent from client.
+ * Binary meta data sent from client.
  */
 public class GridClientBinaryMetaData {
     /** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
index 3ac16f242b4dd..497743085bbbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
@@ -36,7 +36,7 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
     private Object arg;
 
     /** Keep binary flag. */
-    private boolean keepPortables;
+    private boolean keepBinaries;
 
     /**
      * @return Task name.
@@ -69,15 +69,15 @@ public void argument(Object arg) {
     /**
      * @return Keep binary flag.
      */
-    public boolean keepPortables() {
-        return keepPortables;
+    public boolean keepBinaries() {
+        return keepBinaries;
     }
 
     /**
-     * @param keepPortables Keep binary flag.
+     * @param keepBinaries Keep binary flag.
      */
-    public void keepPortables(boolean keepPortables) {
-        this.keepPortables = keepPortables;
+    public void keepBinaries(boolean keepBinaries) {
+        this.keepBinaries = keepBinaries;
     }
 
     /** {@inheritDoc} */
@@ -122,4 +122,4 @@ public void keepPortables(boolean keepPortables) {
     @Override public String toString() {
         return getClass().getSimpleName() + " [taskName=" + taskName + ", arg=" + arg + "]";
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
index 1792e04b96851..1c27ecb20008a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
@@ -276,7 +276,7 @@ public class VisorMimeTypes {
         mimeTypes.put("htm", "text/html");
         mimeTypes.put("docm", "application/vnd.ms-word.document.macroenabled.12");
         mimeTypes.put("xdssc", "application/dssc+xml");
-        mimeTypes.put("pbm", "image/x-portable-bitmap");
+        mimeTypes.put("pbm", "image/x-binary-bitmap");
         mimeTypes.put("fdf", "application/vnd.fdf");
         mimeTypes.put("ggt", "application/vnd.geogebra.tool");
         mimeTypes.put("cii", "application/vnd.anser-web-certificate-issue-initiation");
@@ -760,7 +760,7 @@ public class VisorMimeTypes {
         mimeTypes.put("otf", "application/x-font-otf");
         mimeTypes.put("clkx", "application/vnd.crick.clicker");
         mimeTypes.put("xbd", "application/vnd.fujixerox.docuworks.binder");
-        mimeTypes.put("ppm", "image/x-portable-pixmap");
+        mimeTypes.put("ppm", "image/x-binary-pixmap");
         mimeTypes.put("wav", "audio/x-wav");
         mimeTypes.put("ssml", "application/ssml+xml");
         mimeTypes.put("p7b", "application/x-pkcs7-certificates");
@@ -808,7 +808,7 @@ public class VisorMimeTypes {
         mimeTypes.put("xenc", "application/xenc+xml");
         mimeTypes.put("wpl", "application/vnd.ms-wpl");
         mimeTypes.put("dxf", "image/vnd.dxf");
-        mimeTypes.put("pgm", "image/x-portable-graymap");
+        mimeTypes.put("pgm", "image/x-binary-graymap");
         mimeTypes.put("spot", "text/vnd.in3d.spot");
         mimeTypes.put("odt", "application/vnd.oasis.opendocument.text");
         mimeTypes.put("azs", "application/vnd.airzip.filesecure.azs");
@@ -817,7 +817,7 @@ public class VisorMimeTypes {
         mimeTypes.put("dd2", "application/vnd.oma.dd2+xml");
         mimeTypes.put("semf", "application/vnd.semf");
         mimeTypes.put("semd", "application/vnd.semd");
-        mimeTypes.put("pnm", "image/x-portable-anymap");
+        mimeTypes.put("pnm", "image/x-binary-anymap");
         mimeTypes.put("sema", "application/vnd.sema");
         mimeTypes.put("wma", "audio/x-ms-wma");
         mimeTypes.put("cww", "application/prs.cww");
@@ -1017,4 +1017,4 @@ public class VisorMimeTypes {
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java
deleted file mode 100644
index 90cc5e66e22d3..0000000000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * 
- * Contains portable marshaller API classes.
- */
-package org.apache.ignite.marshaller.portable;
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
index 3914c32e2c5b3..7c5da2f7431d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
@@ -41,7 +41,7 @@ public class PlatformDotNetBinaryConfiguration {
     /** Default serializer. */
     private String dfltSerializer;
 
-    /** Whether to cache deserialized value in IGridPortableObject */
+    /** Whether to cache deserialized value in IGridBinaryObject */
     private boolean dfltKeepDeserialized = true;
 
     /**
@@ -145,7 +145,7 @@ public void setDefaultSerializer(String dfltSerializer) {
     /**
      * Gets default keep deserialized flag. See {@link #setDefaultKeepDeserialized(boolean)} for more information.
      *
-     * @return  Flag indicates whether to cache deserialized value in IGridPortableObject.
+     * @return  Flag indicates whether to cache deserialized value in IGridBinaryObject.
      */
     public boolean isDefaultKeepDeserialized() {
         return dfltKeepDeserialized;
@@ -167,4 +167,4 @@ public void setDefaultKeepDeserialized(boolean keepDeserialized) {
     @Override public String toString() {
         return S.toString(PlatformDotNetBinaryConfiguration.class, this);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
index f3230851c4cc9..d31ab953fd030 100644
--- a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
@@ -61,10 +61,10 @@ public PlatformDotNetBinaryConfiguration getBinaryConfiguration() {
     }
 
     /**
-     * @param portableCfg Configuration.
+     * @param binaryCfg Configuration.
      */
-    public void setBinaryConfiguration(PlatformDotNetBinaryConfiguration portableCfg) {
-        this.binaryCfg = portableCfg;
+    public void setBinaryConfiguration(PlatformDotNetBinaryConfiguration binaryCfg) {
+        this.binaryCfg = binaryCfg;
     }
 
     /**
@@ -94,4 +94,4 @@ private PlatformDotNetConfiguration copy() {
     @Override public String toString() {
         return S.toString(PlatformDotNetConfiguration.class, this);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 2aa0f09008a3a..d801109259f4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -3228,7 +3228,7 @@ else if (log.isDebugEnabled())
                 boolean rmtMarshCompactFooterBool = rmtMarshCompactFooter != null ? rmtMarshCompactFooter : false;
 
                 if (locMarshCompactFooterBool != rmtMarshCompactFooterBool) {
-                    String errMsg = "Local node's portable marshaller \"compactFooter\" property differs from " +
+                    String errMsg = "Local node's binary marshaller \"compactFooter\" property differs from " +
                         "the same property on remote node (make sure all nodes in topology have the same value " +
                         "of \"compactFooter\" property) [locMarshallerCompactFooter=" + locMarshCompactFooterBool +
                         ", rmtMarshallerCompactFooter=" + rmtMarshCompactFooterBool +
@@ -3243,7 +3243,7 @@ else if (log.isDebugEnabled())
                         log.debug(errMsg);
 
                     try {
-                        String sndMsg = "Local node's portable marshaller \"compactFooter\" property differs from " +
+                        String sndMsg = "Local node's binary marshaller \"compactFooter\" property differs from " +
                             "the same property on remote node (make sure all nodes in topology have the same value " +
                             "of \"compactFooter\" property) [locMarshallerCompactFooter=" + rmtMarshCompactFooterBool +
                             ", rmtMarshallerCompactFooter=" + locMarshCompactFooterBool +
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java b/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
index b3747d71fb1bc..df6afcc9e7c34 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
@@ -3263,7 +3263,7 @@ public final V setValue(V value) {
     }
 
     /**
-     * Returns exportable snapshot entry for the given key and value
+     * Returns exbinary snapshot entry for the given key and value
      * when write-through can't or shouldn't be used.
      */
     static  AbstractMap.SimpleEntry entryFor(K k, V v) {
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index c1bac441d9c64..913320b85b7f6 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -300,10 +300,10 @@ org.apache.ignite.internal.binary.BinaryObjectImpl
 org.apache.ignite.internal.binary.BinaryObjectOffheapImpl
 org.apache.ignite.internal.binary.BinaryReaderExImpl$Flag
 org.apache.ignite.internal.binary.BinaryWriteMode
-org.apache.ignite.internal.binary.PortableContext
-org.apache.ignite.internal.binary.PortableSchema
-org.apache.ignite.internal.binary.PortableSchema$Confirmation
-org.apache.ignite.internal.binary.builder.PortableLazyMap$1$1$1
+org.apache.ignite.internal.binary.BinaryContext
+org.apache.ignite.internal.binary.BinarySchema
+org.apache.ignite.internal.binary.BinarySchema$Confirmation
+org.apache.ignite.internal.binary.builder.BinaryLazyMap$1$1$1
 org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion
 org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
 org.apache.ignite.internal.processors.affinity.GridAffinityMessage
@@ -745,14 +745,14 @@ org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$4
 org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$5
 org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$6
 org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$9
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheDefaultPortableAffinityKeyMapper
+org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheDefaultBinaryAffinityKeyMapper
 org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$1
 org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$4
 org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$5
 org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataEntryFilter
 org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataPredicate
 org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetadataProcessor
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.PortableMetadataKey
+org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey
 org.apache.ignite.internal.processors.cache.query.CacheQueryType
 org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1
 org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$3
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
similarity index 100%
rename from modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
rename to modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
similarity index 100%
rename from modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
rename to modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
similarity index 100%
rename from modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
rename to modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
similarity index 100%
rename from modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
rename to modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
similarity index 100%
rename from modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
rename to modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
similarity index 100%
rename from modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
rename to modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
index 7d537054090e2..943c5aa25e50b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
@@ -34,7 +34,7 @@
 import java.util.UUID;
 
 /**
- * Contains tests for portable object fields.
+ * Contains tests for binary object fields.
  */
 public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTest {
     /** Marshaller. */
@@ -43,7 +43,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
     /**
      * Create marshaller.
      *
-     * @return Portable marshaller.
+     * @return Binary marshaller.
      * @throws Exception If failed.
      */
     protected BinaryMarshaller createMarshaller() throws Exception {
@@ -67,7 +67,7 @@ protected BinaryMarshaller createMarshaller() throws Exception {
 
         marsh.setContext(new MarshallerContextTestImpl(null));
 
-        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
 
         return marsh;
     }
@@ -80,12 +80,12 @@ protected boolean compactFooter() {
     }
 
     /**
-     * Get portable context for the current marshaller.
+     * Get binary context for the current marshaller.
      *
      * @param marsh Marshaller.
-     * @return Portable context.
+     * @return Binary context.
      */
-    protected static BinaryContext portableContext(BinaryMarshaller marsh) {
+    protected static BinaryContext binaryContext(BinaryMarshaller marsh) {
         GridBinaryMarshaller impl = U.field(marsh, "impl");
 
         return impl.context();
@@ -478,7 +478,7 @@ else if (val instanceof double[])
     /**
      * Get test context.
      *
-     * @param marsh Portable marshaller.
+     * @param marsh Binary marshaller.
      * @param fieldName Field name.
      * @return Test context.
      * @throws Exception If failed.
@@ -486,7 +486,7 @@ else if (val instanceof double[])
     private TestContext context(BinaryMarshaller marsh, String fieldName) throws Exception {
         TestObject obj = createObject();
 
-        BinaryObjectExImpl portObj = toPortable(marsh, obj);
+        BinaryObjectExImpl portObj = toBinary(marsh, obj);
 
         BinaryField field = portObj.type().field(fieldName);
 
@@ -496,7 +496,7 @@ private TestContext context(BinaryMarshaller marsh, String fieldName) throws Exc
     /**
      * Get test context with nested test object.
      *
-     * @param marsh Portable marshaller.
+     * @param marsh Binary marshaller.
      * @param fieldName Field name.
      * @return Test context.
      * @throws Exception If failed.
@@ -506,7 +506,7 @@ private TestContext nestedContext(BinaryMarshaller marsh, String fieldName)
         TestObject obj = createObject();
         TestOuterObject outObj = new TestOuterObject(obj);
 
-        BinaryObjectExImpl portOutObj = toPortable(marsh, outObj);
+        BinaryObjectExImpl portOutObj = toBinary(marsh, outObj);
         BinaryObjectExImpl portObj = portOutObj.field("fInner");
 
         assert portObj != null;
@@ -526,14 +526,14 @@ private TestObject createObject() {
     }
 
     /**
-     * Convert object to portable object.
+     * Convert object to binary object.
      *
      * @param marsh Marshaller.
      * @param obj Object.
-     * @return Portable object.
+     * @return Binary object.
      * @throws Exception If failed.
      */
-    protected abstract BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception;
+    protected abstract BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception;
 
     /**
      * Outer test object.
@@ -696,7 +696,7 @@ public static class TestContext {
         /** Object. */
         public final TestObject obj;
 
-        /** Portable object. */
+        /** Binary object. */
         public final BinaryObjectExImpl portObj;
 
         /** Field. */
@@ -706,7 +706,7 @@ public static class TestContext {
          * Constructor.
          *
          * @param obj Object.
-         * @param portObj Portable object.
+         * @param portObj Binary object.
          * @param field Field.
          */
         public TestContext(TestObject obj, BinaryObjectExImpl portObj, BinaryField field) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
index 0e92bf431fd89..fceffa01c0135 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
@@ -18,13 +18,13 @@
 package org.apache.ignite.internal.binary;
 
 /**
- * Field tests for heap-based portables.
+ * Field tests for heap-based binaries.
  */
 public class BinaryFieldsHeapSelfTest extends BinaryFieldsAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+    @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
         byte[] bytes = marsh.marshal(obj);
 
-        return new BinaryObjectImpl(portableContext(marsh), bytes, 0);
+        return new BinaryObjectImpl(binaryContext(marsh), bytes, 0);
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
index d24d8982e6e94..87cc5279235b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
@@ -22,7 +22,7 @@
 import sun.misc.Unsafe;
 
 /**
- * Field tests for heap-based portables.
+ * Field tests for heap-based binaries.
  */
 public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
     /** Unsafe instance. */
@@ -46,7 +46,7 @@ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+    @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
         byte[] arr = marsh.marshal(obj);
 
         long ptr = UNSAFE.allocateMemory(arr.length);
@@ -55,6 +55,6 @@ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
 
         UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr, arr.length);
 
-        return new BinaryObjectOffheapImpl(portableContext(marsh), ptr, 0, arr.length);
+        return new BinaryObjectOffheapImpl(binaryContext(marsh), ptr, 0, arr.length);
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
index 43609b8707f9c..0e3749c68d6f2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
@@ -39,7 +39,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
     /** Marshaller. */
     protected BinaryMarshaller marsh;
 
-    /** Portable context. */
+    /** Binary context. */
     protected BinaryContext ctx;
 
     /** {@inheritDoc} */
@@ -62,7 +62,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
 
         marsh.setContext(new MarshallerContextTestImpl(null));
 
-        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
     }
 
     /**
@@ -127,9 +127,9 @@ public void test4Bytes() throws Exception {
     private void check(int len) throws Exception {
         TestObject obj = new TestObject(len);
 
-        BinaryObjectExImpl portObj = toPortable(marsh, obj);
+        BinaryObjectExImpl portObj = toBinary(marsh, obj);
 
-        // 1. Test portable object content.
+        // 1. Test binary object content.
         assert portObj.hasField("field1");
         assert portObj.hasField("field2");
 
@@ -162,14 +162,14 @@ private void check(int len) throws Exception {
     }
 
     /**
-     * Convert object to portable object.
+     * Convert object to binary object.
      *
      * @param marsh Marshaller.
      * @param obj Object.
-     * @return Portable object.
+     * @return Binary object.
      * @throws Exception If failed.
      */
-    protected abstract BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception;
+    protected abstract BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception;
 
     /**
      * Test object.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
index 68e897e189276..7b3a7549299dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
@@ -18,11 +18,11 @@
 package org.apache.ignite.internal.binary;
 
 /**
- * Compact offsets tests for heap portable objects.
+ * Compact offsets tests for heap binary objects.
  */
 public class BinaryFooterOffsetsHeapSelfTest extends BinaryFooterOffsetsAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+    @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
         byte[] bytes = marsh.marshal(obj);
 
         return new BinaryObjectImpl(ctx, bytes, 0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
index f0f0396c24e04..fe9ba17a9f119 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
@@ -22,7 +22,7 @@
 import sun.misc.Unsafe;
 
 /**
- * Compact offsets tests for offheap portable objects.
+ * Compact offsets tests for offheap binary objects.
  */
 public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstractSelfTest {
     /** Unsafe instance. */
@@ -46,7 +46,7 @@ public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstr
     }
 
     /** {@inheritDoc} */
-    @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+    @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
         byte[] arr = marsh.marshal(obj);
 
         long ptr = UNSAFE.allocateMemory(arr.length);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 52fecbf6930fa..4ecad0918f06f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -89,7 +89,7 @@
 import static org.junit.Assert.assertNotEquals;
 
 /**
- * Portable marshaller tests.
+ * Binary marshaller tests.
  */
 @SuppressWarnings({"OverlyStrongTypeCast", "ArrayHashCode", "ConstantConditions"})
 public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
@@ -632,7 +632,7 @@ public void testSimpleObject() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortable() throws Exception {
+    public void testBinary() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName()),
             new BinaryTypeConfiguration(TestBinary.class.getName())
@@ -711,45 +711,45 @@ public void testPortable() throws Exception {
             new Integer(((BinaryObject)simplePo.field("enumVal")).enumOrdinal()));
         assertArrayEquals(ordinals(obj.simple.enumArr), ordinals((BinaryObject[])simplePo.field("enumArr")));
         assertNull(simplePo.field("simple"));
-        assertNull(simplePo.field("portable"));
+        assertNull(simplePo.field("binary"));
         assertNull(simplePo.field("unknown"));
 
-        BinaryObject portablePo = po.field("_portable");
-
-        assertEquals(obj.portable, portablePo.deserialize());
-
-        assertEquals(obj.portable.b, (byte)portablePo.field("_b"));
-        assertEquals(obj.portable.s, (short)portablePo.field("_s"));
-        assertEquals(obj.portable.i, (int)portablePo.field("_i"));
-        assertEquals(obj.portable.l, (long)portablePo.field("_l"));
-        assertEquals(obj.portable.f, (float)portablePo.field("_f"), 0);
-        assertEquals(obj.portable.d, (double)portablePo.field("_d"), 0);
-        assertEquals(obj.portable.c, (char)portablePo.field("_c"));
-        assertEquals(obj.portable.bool, (boolean)portablePo.field("_bool"));
-        assertEquals(obj.portable.str, portablePo.field("_str"));
-        assertEquals(obj.portable.uuid, portablePo.field("_uuid"));
-        assertEquals(obj.portable.date, portablePo.field("_date"));
-        assertEquals(obj.portable.ts, portablePo.field("_ts"));
-        assertArrayEquals(obj.portable.bArr, (byte[])portablePo.field("_bArr"));
-        assertArrayEquals(obj.portable.sArr, (short[])portablePo.field("_sArr"));
-        assertArrayEquals(obj.portable.iArr, (int[])portablePo.field("_iArr"));
-        assertArrayEquals(obj.portable.lArr, (long[])portablePo.field("_lArr"));
-        assertArrayEquals(obj.portable.fArr, (float[])portablePo.field("_fArr"), 0);
-        assertArrayEquals(obj.portable.dArr, (double[])portablePo.field("_dArr"), 0);
-        assertArrayEquals(obj.portable.cArr, (char[])portablePo.field("_cArr"));
-        assertBooleanArrayEquals(obj.portable.boolArr, (boolean[])portablePo.field("_boolArr"));
-        assertArrayEquals(obj.portable.strArr, (String[])portablePo.field("_strArr"));
-        assertArrayEquals(obj.portable.uuidArr, (UUID[])portablePo.field("_uuidArr"));
-        assertArrayEquals(obj.portable.dateArr, (Date[])portablePo.field("_dateArr"));
-        assertArrayEquals(obj.portable.objArr, (Object[])portablePo.field("_objArr"));
-        assertEquals(obj.portable.col, portablePo.field("_col"));
-        assertEquals(obj.portable.map, portablePo.field("_map"));
-        assertEquals(new Integer(obj.portable.enumVal.ordinal()),
-            new Integer(((BinaryObject)portablePo.field("_enumVal")).enumOrdinal()));
-        assertArrayEquals(ordinals(obj.portable.enumArr), ordinals((BinaryObject[])portablePo.field("_enumArr")));
-        assertNull(portablePo.field("_simple"));
-        assertNull(portablePo.field("_portable"));
-        assertNull(portablePo.field("unknown"));
+        BinaryObject binaryPo = po.field("_binary");
+
+        assertEquals(obj.binary, binaryPo.deserialize());
+
+        assertEquals(obj.binary.b, (byte)binaryPo.field("_b"));
+        assertEquals(obj.binary.s, (short)binaryPo.field("_s"));
+        assertEquals(obj.binary.i, (int)binaryPo.field("_i"));
+        assertEquals(obj.binary.l, (long)binaryPo.field("_l"));
+        assertEquals(obj.binary.f, (float)binaryPo.field("_f"), 0);
+        assertEquals(obj.binary.d, (double)binaryPo.field("_d"), 0);
+        assertEquals(obj.binary.c, (char)binaryPo.field("_c"));
+        assertEquals(obj.binary.bool, (boolean)binaryPo.field("_bool"));
+        assertEquals(obj.binary.str, binaryPo.field("_str"));
+        assertEquals(obj.binary.uuid, binaryPo.field("_uuid"));
+        assertEquals(obj.binary.date, binaryPo.field("_date"));
+        assertEquals(obj.binary.ts, binaryPo.field("_ts"));
+        assertArrayEquals(obj.binary.bArr, (byte[])binaryPo.field("_bArr"));
+        assertArrayEquals(obj.binary.sArr, (short[])binaryPo.field("_sArr"));
+        assertArrayEquals(obj.binary.iArr, (int[])binaryPo.field("_iArr"));
+        assertArrayEquals(obj.binary.lArr, (long[])binaryPo.field("_lArr"));
+        assertArrayEquals(obj.binary.fArr, (float[])binaryPo.field("_fArr"), 0);
+        assertArrayEquals(obj.binary.dArr, (double[])binaryPo.field("_dArr"), 0);
+        assertArrayEquals(obj.binary.cArr, (char[])binaryPo.field("_cArr"));
+        assertBooleanArrayEquals(obj.binary.boolArr, (boolean[])binaryPo.field("_boolArr"));
+        assertArrayEquals(obj.binary.strArr, (String[])binaryPo.field("_strArr"));
+        assertArrayEquals(obj.binary.uuidArr, (UUID[])binaryPo.field("_uuidArr"));
+        assertArrayEquals(obj.binary.dateArr, (Date[])binaryPo.field("_dateArr"));
+        assertArrayEquals(obj.binary.objArr, (Object[])binaryPo.field("_objArr"));
+        assertEquals(obj.binary.col, binaryPo.field("_col"));
+        assertEquals(obj.binary.map, binaryPo.field("_map"));
+        assertEquals(new Integer(obj.binary.enumVal.ordinal()),
+            new Integer(((BinaryObject)binaryPo.field("_enumVal")).enumOrdinal()));
+        assertArrayEquals(ordinals(obj.binary.enumArr), ordinals((BinaryObject[])binaryPo.field("_enumArr")));
+        assertNull(binaryPo.field("_simple"));
+        assertNull(binaryPo.field("_binary"));
+        assertNull(binaryPo.field("unknown"));
     }
 
     /**
@@ -859,7 +859,7 @@ public TestQueue(String name) {
 
     /**
      * @param obj Simple object.
-     * @param po Portable object.
+     * @param po Binary object.
      */
     private void checkSimpleObjectData(SimpleObject obj, BinaryObject po) {
         assertEquals(obj.b, (byte)po.field("b"));
@@ -1343,7 +1343,7 @@ public void testTypeNames() throws Exception {
             customType4
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         assertEquals("notconfiguredclass".hashCode(), ctx.typeId("NotConfiguredClass"));
         assertEquals("key".hashCode(), ctx.typeId("Key"));
@@ -1406,7 +1406,7 @@ public void testFieldIdMapping() throws Exception {
             customType1,
             customType2));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         assertEquals("val".hashCode(), ctx.fieldId("key".hashCode(), "val"));
         assertEquals("val".hashCode(), ctx.fieldId("nonexistentclass2".hashCode(), "val"));
@@ -1463,7 +1463,7 @@ public void testDuplicateTypeId() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopy() throws Exception {
+    public void testBinaryCopy() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1578,7 +1578,7 @@ public void testPortableCopy() throws Exception {
 //                    return null;
 //                }
 //            },
-//            PortableException.class,
+//            BinaryException.class,
 //            "Invalid value type for field: i"
 //        );
     }
@@ -1586,7 +1586,7 @@ public void testPortableCopy() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyString() throws Exception {
+    public void testBinaryCopyString() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1607,7 +1607,7 @@ public void testPortableCopyString() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyUuid() throws Exception {
+    public void testBinaryCopyUuid() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1630,7 +1630,7 @@ public void testPortableCopyUuid() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyByteArray() throws Exception {
+    public void testBinaryCopyByteArray() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1649,7 +1649,7 @@ public void testPortableCopyByteArray() throws Exception {
     }
 
     /**
-     * @param po Portable object.
+     * @param po Binary object.
      * @param fields Fields.
      * @return Copy.
      */
@@ -1667,7 +1667,7 @@ private BinaryObject copy(BinaryObject po, Map fields) {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyShortArray() throws Exception {
+    public void testBinaryCopyShortArray() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1688,7 +1688,7 @@ public void testPortableCopyShortArray() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyIntArray() throws Exception {
+    public void testBinaryCopyIntArray() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1709,7 +1709,7 @@ public void testPortableCopyIntArray() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyLongArray() throws Exception {
+    public void testBinaryCopyLongArray() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1730,7 +1730,7 @@ public void testPortableCopyLongArray() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyFloatArray() throws Exception {
+    public void testBinaryCopyFloatArray() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1751,7 +1751,7 @@ public void testPortableCopyFloatArray() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyDoubleArray() throws Exception {
+    public void testBinaryCopyDoubleArray() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1772,7 +1772,7 @@ public void testPortableCopyDoubleArray() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyCharArray() throws Exception {
+    public void testBinaryCopyCharArray() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1793,7 +1793,7 @@ public void testPortableCopyCharArray() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyStringArray() throws Exception {
+    public void testBinaryCopyStringArray() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1814,7 +1814,7 @@ public void testPortableCopyStringArray() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyObject() throws Exception {
+    public void testBinaryCopyObject() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1841,7 +1841,7 @@ public void testPortableCopyObject() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyNonPrimitives() throws Exception {
+    public void testBinaryCopyNonPrimitives() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration(SimpleObject.class.getName())
         ));
@@ -1878,7 +1878,7 @@ public void testPortableCopyNonPrimitives() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableCopyMixed() throws Exception {
+    public void testBinaryCopyMixed() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName())));
 
         SimpleObject obj = simpleObject();
@@ -1939,10 +1939,10 @@ public void testKeepDeserialized() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testOffheapPortable() throws Exception {
+    public void testOffheapBinary() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName())));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         SimpleObject simpleObj = simpleObject();
 
@@ -2038,11 +2038,11 @@ public void testReadResolve() throws Exception {
             new BinaryTypeConfiguration(MySingleton.class.getName()),
             new BinaryTypeConfiguration(SingletonMarker.class.getName())));
 
-        BinaryObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh);
+        BinaryObjectImpl binaryObj = marshal(MySingleton.INSTANCE, marsh);
 
-        assertTrue(portableObj.array().length <= 1024); // Check that big string was not serialized.
+        assertTrue(binaryObj.array().length <= 1024); // Check that big string was not serialized.
 
-        MySingleton singleton = portableObj.deserialize();
+        MySingleton singleton = binaryObj.deserialize();
 
         assertSame(MySingleton.INSTANCE, singleton);
     }
@@ -2050,13 +2050,13 @@ public void testReadResolve() throws Exception {
     /**
      *
      */
-    public void testReadResolveOnPortableAware() throws Exception {
+    public void testReadResolveOnBinaryAware() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller(Collections.singletonList(
             new BinaryTypeConfiguration(MyTestClass.class.getName())));
 
-        BinaryObjectImpl portableObj = marshal(new MyTestClass(), marsh);
+        BinaryObjectImpl binaryObj = marshal(new MyTestClass(), marsh);
 
-        MyTestClass obj = portableObj.deserialize();
+        MyTestClass obj = binaryObj.deserialize();
 
         assertEquals("readResolve", obj.s);
     }
@@ -2065,11 +2065,11 @@ public void testReadResolveOnPortableAware() throws Exception {
      * @throws Exception If ecxeption thrown.
      */
     public void testDeclareReadResolveInParent() throws Exception {
-        BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(ChildPortable.class.getName())));
+        BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(ChildBinary.class.getName())));
 
-        BinaryObjectImpl portableObj = marshal(new ChildPortable(), marsh);
+        BinaryObjectImpl binaryObj = marshal(new ChildBinary(), marsh);
 
-        ChildPortable singleton = portableObj.deserialize();
+        ChildBinary singleton = binaryObj.deserialize();
 
         assertNotNull(singleton.s);
     }
@@ -2140,7 +2140,7 @@ public void testThreadLocalArrayReleased() throws Exception {
 
         BinaryMarshaller marsh = binaryMarshaller();
 
-        try (BinaryWriterExImpl writer = new BinaryWriterExImpl(portableContext(marsh))) {
+        try (BinaryWriterExImpl writer = new BinaryWriterExImpl(binaryContext(marsh))) {
             assertEquals(true, INSTANCE.isAcquired());
 
             writer.writeString("Thread local test");
@@ -2150,7 +2150,7 @@ public void testThreadLocalArrayReleased() throws Exception {
             assertEquals(true, INSTANCE.isAcquired());
         }
 
-        // Checking the portable marshaller.
+        // Checking the binary marshaller.
         assertEquals(false, INSTANCE.isAcquired());
 
         marsh = binaryMarshaller();
@@ -2162,12 +2162,12 @@ public void testThreadLocalArrayReleased() throws Exception {
         marsh = binaryMarshaller();
 
         // Checking the builder.
-        BinaryObjectBuilder builder = new BinaryObjectBuilderImpl(portableContext(marsh),
+        BinaryObjectBuilder builder = new BinaryObjectBuilderImpl(binaryContext(marsh),
             "org.gridgain.foo.bar.TestClass");
 
         builder.setField("a", "1");
 
-        BinaryObject portableObj = builder.build();
+        BinaryObject binaryObj = builder.build();
 
         assertEquals(false, INSTANCE.isAcquired());
     }
@@ -2273,7 +2273,7 @@ public void testMarshallingThroughJdk() throws Exception {
     public void testPredefinedTypeIds() throws Exception {
         BinaryMarshaller marsh = binaryMarshaller();
 
-        BinaryContext pCtx = portableContext(marsh);
+        BinaryContext pCtx = binaryContext(marsh);
 
         Field field = pCtx.getClass().getDeclaredField("predefinedTypeNames");
 
@@ -2615,11 +2615,11 @@ private > Integer[] ordinals(BinaryObject[] enumArr) {
     }
 
     /**
-     * @param po Portable object.
+     * @param po Binary object.
      * @param off Offset.
      * @return Value.
      */
-    private int intFromPortable(BinaryObject po, int off) {
+    private int intFromBinary(BinaryObject po, int off) {
         byte[] arr = U.field(po, "arr");
 
         return Integer.reverseBytes(U.bytesToInt(arr, off));
@@ -2647,7 +2647,7 @@ private  T marshalUnmarshal(Object obj, BinaryMarshaller marsh) throws Ignite
     /**
      * @param obj Object.
      * @param marsh Marshaller.
-     * @return Portable object.
+     * @return Binary object.
      */
     private  BinaryObjectImpl marshal(T obj, BinaryMarshaller marsh) throws IgniteCheckedException {
         byte[] bytes = marsh.marshal(obj);
@@ -2665,9 +2665,9 @@ protected boolean compactFooter() {
 
     /**
      * @param marsh Marshaller.
-     * @return Portable context.
+     * @return Binary context.
      */
-    protected BinaryContext portableContext(BinaryMarshaller marsh) {
+    protected BinaryContext binaryContext(BinaryMarshaller marsh) {
         GridBinaryMarshaller impl = U.field(marsh, "impl");
 
         return impl.context();
@@ -2731,7 +2731,7 @@ protected BinaryMarshaller binaryMarshaller(
 
         marsh.setContext(new MarshallerContextTestImpl(null));
 
-        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
 
         return marsh;
     }
@@ -2849,7 +2849,7 @@ private SimpleObject simpleObject() {
     }
 
     /**
-     * @return Portable object.
+     * @return Binary object.
      */
     private TestBinary binaryObject() {
         SimpleObject innerSimple = new SimpleObject();
@@ -2891,80 +2891,80 @@ private TestBinary binaryObject() {
         innerSimple.map.put(2, "str2");
         innerSimple.map.put(3, "str3");
 
-        TestBinary innerPortable = new TestBinary();
-
-        innerPortable.b = 2;
-        innerPortable.s = 2;
-        innerPortable.i = 2;
-        innerPortable.l = 2;
-        innerPortable.f = 2.2f;
-        innerPortable.d = 2.2d;
-        innerPortable.c = 2;
-        innerPortable.bool = true;
-        innerPortable.str = "str2";
-        innerPortable.uuid = UUID.randomUUID();
-        innerPortable.date = new Date();
-        innerPortable.ts = new Timestamp(System.currentTimeMillis());
-        innerPortable.bArr = new byte[] {10, 20, 30};
-        innerPortable.sArr = new short[] {10, 20, 30};
-        innerPortable.iArr = new int[] {10, 20, 30};
-        innerPortable.lArr = new long[] {10, 20, 30};
-        innerPortable.fArr = new float[] {10.01f, 20.02f, 30.03f};
-        innerPortable.dArr = new double[] {10.01d, 20.02d, 30.03d};
-        innerPortable.cArr = new char[] {10, 20, 30};
-        innerPortable.boolArr = new boolean[] {true, false, true};
-        innerPortable.strArr = new String[] {"str10", "str20", "str30"};
-        innerPortable.uuidArr = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
-        innerPortable.dateArr = new Date[] {new Date(44444), new Date(55555), new Date(66666)};
-        innerPortable.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
-        innerPortable.bRaw = 3;
-        innerPortable.sRaw = 3;
-        innerPortable.iRaw = 3;
-        innerPortable.lRaw = 3;
-        innerPortable.fRaw = 3.3f;
-        innerPortable.dRaw = 3.3d;
-        innerPortable.cRaw = 3;
-        innerPortable.boolRaw = true;
-        innerPortable.strRaw = "str3";
-        innerPortable.uuidRaw = UUID.randomUUID();
-        innerPortable.dateRaw = new Date();
-        innerPortable.tsRaw = new Timestamp(System.currentTimeMillis());
-        innerPortable.bArrRaw = new byte[] {11, 21, 31};
-        innerPortable.sArrRaw = new short[] {11, 21, 31};
-        innerPortable.iArrRaw = new int[] {11, 21, 31};
-        innerPortable.lArrRaw = new long[] {11, 21, 31};
-        innerPortable.fArrRaw = new float[] {11.11f, 21.12f, 31.13f};
-        innerPortable.dArrRaw = new double[] {11.11d, 21.12d, 31.13d};
-        innerPortable.cArrRaw = new char[] {11, 21, 31};
-        innerPortable.boolArrRaw = new boolean[] {true, false, true};
-        innerPortable.strArrRaw = new String[] {"str11", "str21", "str31"};
-        innerPortable.uuidArrRaw = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
-        innerPortable.dateArrRaw = new Date[] {new Date(77777), new Date(88888), new Date(99999)};
-        innerPortable.objArrRaw = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
-        innerPortable.col = new ArrayList<>();
-        innerPortable.colRaw = new ArrayList<>();
-        innerPortable.map = new HashMap<>();
-        innerPortable.mapRaw = new HashMap<>();
-        innerPortable.enumVal = TestEnum.B;
-        innerPortable.enumValRaw = TestEnum.C;
-        innerPortable.enumArr = new TestEnum[] {TestEnum.B, TestEnum.C};
-        innerPortable.enumArrRaw = new TestEnum[] {TestEnum.C, TestEnum.D};
-
-        innerPortable.col.add("str4");
-        innerPortable.col.add("str5");
-        innerPortable.col.add("str6");
-
-        innerPortable.map.put(4, "str4");
-        innerPortable.map.put(5, "str5");
-        innerPortable.map.put(6, "str6");
-
-        innerPortable.colRaw.add("str7");
-        innerPortable.colRaw.add("str8");
-        innerPortable.colRaw.add("str9");
-
-        innerPortable.mapRaw.put(7, "str7");
-        innerPortable.mapRaw.put(8, "str8");
-        innerPortable.mapRaw.put(9, "str9");
+        TestBinary innerBinary = new TestBinary();
+
+        innerBinary.b = 2;
+        innerBinary.s = 2;
+        innerBinary.i = 2;
+        innerBinary.l = 2;
+        innerBinary.f = 2.2f;
+        innerBinary.d = 2.2d;
+        innerBinary.c = 2;
+        innerBinary.bool = true;
+        innerBinary.str = "str2";
+        innerBinary.uuid = UUID.randomUUID();
+        innerBinary.date = new Date();
+        innerBinary.ts = new Timestamp(System.currentTimeMillis());
+        innerBinary.bArr = new byte[] {10, 20, 30};
+        innerBinary.sArr = new short[] {10, 20, 30};
+        innerBinary.iArr = new int[] {10, 20, 30};
+        innerBinary.lArr = new long[] {10, 20, 30};
+        innerBinary.fArr = new float[] {10.01f, 20.02f, 30.03f};
+        innerBinary.dArr = new double[] {10.01d, 20.02d, 30.03d};
+        innerBinary.cArr = new char[] {10, 20, 30};
+        innerBinary.boolArr = new boolean[] {true, false, true};
+        innerBinary.strArr = new String[] {"str10", "str20", "str30"};
+        innerBinary.uuidArr = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+        innerBinary.dateArr = new Date[] {new Date(44444), new Date(55555), new Date(66666)};
+        innerBinary.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+        innerBinary.bRaw = 3;
+        innerBinary.sRaw = 3;
+        innerBinary.iRaw = 3;
+        innerBinary.lRaw = 3;
+        innerBinary.fRaw = 3.3f;
+        innerBinary.dRaw = 3.3d;
+        innerBinary.cRaw = 3;
+        innerBinary.boolRaw = true;
+        innerBinary.strRaw = "str3";
+        innerBinary.uuidRaw = UUID.randomUUID();
+        innerBinary.dateRaw = new Date();
+        innerBinary.tsRaw = new Timestamp(System.currentTimeMillis());
+        innerBinary.bArrRaw = new byte[] {11, 21, 31};
+        innerBinary.sArrRaw = new short[] {11, 21, 31};
+        innerBinary.iArrRaw = new int[] {11, 21, 31};
+        innerBinary.lArrRaw = new long[] {11, 21, 31};
+        innerBinary.fArrRaw = new float[] {11.11f, 21.12f, 31.13f};
+        innerBinary.dArrRaw = new double[] {11.11d, 21.12d, 31.13d};
+        innerBinary.cArrRaw = new char[] {11, 21, 31};
+        innerBinary.boolArrRaw = new boolean[] {true, false, true};
+        innerBinary.strArrRaw = new String[] {"str11", "str21", "str31"};
+        innerBinary.uuidArrRaw = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+        innerBinary.dateArrRaw = new Date[] {new Date(77777), new Date(88888), new Date(99999)};
+        innerBinary.objArrRaw = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+        innerBinary.col = new ArrayList<>();
+        innerBinary.colRaw = new ArrayList<>();
+        innerBinary.map = new HashMap<>();
+        innerBinary.mapRaw = new HashMap<>();
+        innerBinary.enumVal = TestEnum.B;
+        innerBinary.enumValRaw = TestEnum.C;
+        innerBinary.enumArr = new TestEnum[] {TestEnum.B, TestEnum.C};
+        innerBinary.enumArrRaw = new TestEnum[] {TestEnum.C, TestEnum.D};
+
+        innerBinary.col.add("str4");
+        innerBinary.col.add("str5");
+        innerBinary.col.add("str6");
+
+        innerBinary.map.put(4, "str4");
+        innerBinary.map.put(5, "str5");
+        innerBinary.map.put(6, "str6");
+
+        innerBinary.colRaw.add("str7");
+        innerBinary.colRaw.add("str8");
+        innerBinary.colRaw.add("str9");
+
+        innerBinary.mapRaw.put(7, "str7");
+        innerBinary.mapRaw.put(8, "str8");
+        innerBinary.mapRaw.put(9, "str9");
 
         TestBinary outer = new TestBinary();
 
@@ -2993,7 +2993,7 @@ private TestBinary binaryObject() {
         outer.dateArr = new Date[] {new Date(10101), new Date(20202), new Date(30303)};
         outer.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
         outer.simple = innerSimple;
-        outer.portable = innerPortable;
+        outer.binary = innerBinary;
         outer.bRaw = 5;
         outer.sRaw = 5;
         outer.iRaw = 5;
@@ -3027,7 +3027,7 @@ private TestBinary binaryObject() {
         outer.enumArr = new TestEnum[] {TestEnum.D, TestEnum.E};
         outer.enumArrRaw = new TestEnum[] {TestEnum.E, TestEnum.A};
         outer.simpleRaw = innerSimple;
-        outer.portableRaw = innerPortable;
+        outer.binaryRaw = innerBinary;
 
         outer.col.add("str10");
         outer.col.add("str11");
@@ -3346,10 +3346,10 @@ private static class TestBinary implements Binarylizable {
         private SimpleObject simpleRaw;
 
         /** */
-        private TestBinary portable;
+        private TestBinary binary;
 
         /** */
-        private TestBinary portableRaw;
+        private TestBinary binaryRaw;
 
         /** {@inheritDoc} */
         @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
@@ -3382,7 +3382,7 @@ private static class TestBinary implements Binarylizable {
             writer.writeEnum("_enumVal", enumVal);
             writer.writeEnumArray("_enumArr", enumArr);
             writer.writeObject("_simple", simple);
-            writer.writeObject("_portable", portable);
+            writer.writeObject("_binary", binary);
 
             BinaryRawWriter raw = writer.rawWriter();
 
@@ -3415,7 +3415,7 @@ private static class TestBinary implements Binarylizable {
             raw.writeEnum(enumValRaw);
             raw.writeEnumArray(enumArrRaw);
             raw.writeObject(simpleRaw);
-            raw.writeObject(portableRaw);
+            raw.writeObject(binaryRaw);
         }
 
         /** {@inheritDoc} */
@@ -3449,7 +3449,7 @@ private static class TestBinary implements Binarylizable {
             enumVal = reader.readEnum("_enumVal");
             enumArr = reader.readEnumArray("_enumArr");
             simple = reader.readObject("_simple");
-            portable = reader.readObject("_portable");
+            binary = reader.readObject("_binary");
 
             BinaryRawReader raw = reader.rawReader();
 
@@ -3482,7 +3482,7 @@ private static class TestBinary implements Binarylizable {
             enumValRaw = raw.readEnum();
             enumArrRaw = raw.readEnumArray();
             simpleRaw = raw.readObject();
-            portableRaw = raw.readObject();
+            binaryRaw = raw.readObject();
         }
 
         /** {@inheritDoc} */
@@ -4089,7 +4089,7 @@ Object readResolve() {
     /**
      *
      */
-    public static class ChildPortable extends ParentPortable {
+    public static class ChildBinary extends ParentBinary {
 
     }
 
@@ -4147,7 +4147,7 @@ public SimpleExternalizable(String field) {
     /**
      *
      */
-    private static class ParentPortable {
+    private static class ParentBinary {
         /** */
         public String s;
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
index a1f980ca80bc1..572df881793c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
@@ -106,9 +106,9 @@ protected boolean compactFooter() {
     }
 
     /**
-     * @return Portables API.
+     * @return Binaries API.
      */
-    protected IgniteBinary portables() {
+    protected IgniteBinary binaries() {
         return grid(0).binary();
     }
 
@@ -931,7 +931,7 @@ public void testMetadataChangingDoublePut() {
 
         mutableObj.build();
 
-        BinaryType metadata = portables().type(GridBinaryTestClasses.TestObjectContainer.class);
+        BinaryType metadata = binaries().type(GridBinaryTestClasses.TestObjectContainer.class);
 
         assertEquals("String", metadata.fieldTypeName("xx567"));
     }
@@ -947,7 +947,7 @@ public void testMetadataChangingDoublePut2() {
 
         mutableObj.build();
 
-        BinaryType metadata = portables().type(GridBinaryTestClasses.TestObjectContainer.class);
+        BinaryType metadata = binaries().type(GridBinaryTestClasses.TestObjectContainer.class);
 
         assertEquals("String", metadata.fieldTypeName("xx567"));
     }
@@ -971,7 +971,7 @@ public void testMetadataChanging() {
 
         mutableObj.build();
 
-        BinaryType metadata = portables().type(c.getClass());
+        BinaryType metadata = binaries().type(c.getClass());
 
         assertTrue(metadata.fieldNames().containsAll(Arrays.asList("intField", "intArrField", "arrField", "strField",
             "colField", "mapField", "enumField", "enumArrField")));
@@ -1140,8 +1140,8 @@ public void testSavingObjectWithNotZeroStart() {
     /**
      *
      */
-    public void testPortableObjectField() {
-        GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer(toPortable(new GridBinaryTestClasses.TestObjectArrayList()));
+    public void testBinaryObjectField() {
+        GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer(toBinary(new GridBinaryTestClasses.TestObjectArrayList()));
 
         BinaryObjectBuilderImpl wrapper = wrap(container);
 
@@ -1154,12 +1154,12 @@ public void testPortableObjectField() {
     /**
      *
      */
-    public void testAssignPortableObject() {
+    public void testAssignBinaryObject() {
         GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer();
 
         BinaryObjectBuilderImpl wrapper = wrap(container);
 
-        wrapper.setField("foo", toPortable(new GridBinaryTestClasses.TestObjectArrayList()));
+        wrapper.setField("foo", toBinary(new GridBinaryTestClasses.TestObjectArrayList()));
 
         GridBinaryTestClasses.TestObjectContainer deserialized = wrapper.build().deserialize();
         assertTrue(deserialized.foo instanceof GridBinaryTestClasses.TestObjectArrayList);
@@ -1185,7 +1185,7 @@ public void testRemoveFromExistingObject() {
         GridBinaryTestClasses.TestObjectAllTypes obj = new GridBinaryTestClasses.TestObjectAllTypes();
         obj.setDefaultData();
 
-        BinaryObjectBuilderImpl wrapper = wrap(toPortable(obj));
+        BinaryObjectBuilderImpl wrapper = wrap(toBinary(obj));
 
         wrapper.removeField("str");
 
@@ -1205,7 +1205,7 @@ public void testCyclicArrays() {
 
         obj.foo = arr1;
 
-        GridBinaryTestClasses.TestObjectContainer res = toPortable(obj).deserialize();
+        GridBinaryTestClasses.TestObjectContainer res = toBinary(obj).deserialize();
 
         Object[] resArr = (Object[])res.foo;
 
@@ -1227,7 +1227,7 @@ public void testCyclicArrayList() {
 
         obj.foo = arr1;
 
-        GridBinaryTestClasses.TestObjectContainer res = toPortable(obj).deserialize();
+        GridBinaryTestClasses.TestObjectContainer res = toBinary(obj).deserialize();
 
         List resArr = (List)res.foo;
 
@@ -1236,18 +1236,18 @@ public void testCyclicArrayList() {
 
     /**
      * @param obj Object.
-     * @return Object in portable format.
+     * @return Object in binary format.
      */
-    private BinaryObject toPortable(Object obj) {
-        return portables().toBinary(obj);
+    private BinaryObject toBinary(Object obj) {
+        return binaries().toBinary(obj);
     }
 
     /**
      * @param obj Object.
-     * @return GridMutablePortableObject.
+     * @return GridMutableBinaryObject.
      */
     private BinaryObjectBuilderImpl wrap(Object obj) {
-        return BinaryObjectBuilderImpl.wrap(toPortable(obj));
+        return BinaryObjectBuilderImpl.wrap(toBinary(obj));
     }
 
     /**
@@ -1256,9 +1256,9 @@ private BinaryObjectBuilderImpl wrap(Object obj) {
      */
     private BinaryObjectBuilderImpl newWrapper(Class aCls) {
         CacheObjectBinaryProcessorImpl processor = (CacheObjectBinaryProcessorImpl)(
-            (IgniteBinaryImpl)portables()).processor();
+            (IgniteBinaryImpl)binaries()).processor();
 
-        return new BinaryObjectBuilderImpl(processor.portableContext(), processor.typeId(aCls.getName()),
+        return new BinaryObjectBuilderImpl(processor.binaryContext(), processor.typeId(aCls.getName()),
             aCls.getSimpleName());
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
index 2a3fe53ee17e7..2424fe8a4b32a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
@@ -46,7 +46,7 @@
 import sun.misc.Unsafe;
 
 /**
- * Portable builder test.
+ * Binary builder test.
  */
 @SuppressWarnings("ResultOfMethodCallIgnored")
 public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
@@ -80,7 +80,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
         bCfg.setTypeConfigurations(Arrays.asList(
             new BinaryTypeConfiguration(Key.class.getName()),
             new BinaryTypeConfiguration(Value.class.getName()),
-            new BinaryTypeConfiguration("org.gridgain.grid.internal.util.portable.mutabletest.*"),
+            new BinaryTypeConfiguration("org.gridgain.grid.internal.util.binary.mutabletest.*"),
             customTypeCfg));
 
         cfg.setBinaryConfiguration(bCfg);
@@ -115,7 +115,7 @@ public void testAllFieldsSerialization() {
         obj.setDefaultData();
         obj.enumArr = null;
 
-        GridBinaryTestClasses.TestObjectAllTypes deserialized = builder(toPortable(obj)).build().deserialize();
+        GridBinaryTestClasses.TestObjectAllTypes deserialized = builder(toBinary(obj)).build().deserialize();
 
         GridTestUtils.deepEquals(obj, deserialized);
     }
@@ -723,7 +723,7 @@ public void testSeveralFields() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testOffheapPortable() throws Exception {
+    public void testOffheapBinary() throws Exception {
         BinaryObjectBuilder builder = builder("Class");
 
         builder.hashCode(100);
@@ -891,7 +891,7 @@ public void testCopyFromInnerObjects() {
 
         GridBinaryTestClasses.TestObjectContainer c = new GridBinaryTestClasses.TestObjectContainer(list);
 
-        BinaryObjectBuilderImpl builder = builder(toPortable(c));
+        BinaryObjectBuilderImpl builder = builder(toBinary(c));
         builder.getField("foo").add("!!!");
 
         BinaryObject res = builder.build();
@@ -908,25 +908,25 @@ public void testCopyFromInnerObjects() {
     /**
      *
      */
-    public void testSetPortableObject() {
-        BinaryObject portableObj = builder(GridBinaryTestClasses.TestObjectContainer.class.getName())
-            .setField("foo", toPortable(new GridBinaryTestClasses.TestObjectAllTypes()))
+    public void testSetBinaryObject() {
+        BinaryObject binaryObj = builder(GridBinaryTestClasses.TestObjectContainer.class.getName())
+            .setField("foo", toBinary(new GridBinaryTestClasses.TestObjectAllTypes()))
             .build();
 
-        assertTrue(portableObj.deserialize().foo instanceof GridBinaryTestClasses.TestObjectAllTypes);
+        assertTrue(binaryObj.deserialize().foo instanceof GridBinaryTestClasses.TestObjectAllTypes);
     }
 
     /**
      *
      */
-    public void testPlainPortableObjectCopyFrom() {
-        GridBinaryTestClasses.TestObjectPlainPortable obj = new GridBinaryTestClasses.TestObjectPlainPortable(toPortable(new GridBinaryTestClasses.TestObjectAllTypes()));
+    public void testPlainBinaryObjectCopyFrom() {
+        GridBinaryTestClasses.TestObjectPlainBinary obj = new GridBinaryTestClasses.TestObjectPlainBinary(toBinary(new GridBinaryTestClasses.TestObjectAllTypes()));
 
-        BinaryObjectBuilderImpl builder = builder(toPortable(obj));
-        assertTrue(builder.getField("plainPortable") instanceof BinaryObject);
+        BinaryObjectBuilderImpl builder = builder(toBinary(obj));
+        assertTrue(builder.getField("plainBinary") instanceof BinaryObject);
 
-        GridBinaryTestClasses.TestObjectPlainPortable deserialized = builder.build().deserialize();
-        assertTrue(deserialized.plainPortable != null);
+        GridBinaryTestClasses.TestObjectPlainBinary deserialized = builder.build().deserialize();
+        assertTrue(deserialized.plainBinary != null);
     }
 
     /**
@@ -950,7 +950,7 @@ public void testRemoveFromExistingObject() {
         obj.setDefaultData();
         obj.enumArr = null;
 
-        BinaryObjectBuilder builder = builder(toPortable(obj));
+        BinaryObjectBuilder builder = builder(toBinary(obj));
 
         builder.removeField("str");
 
@@ -969,7 +969,7 @@ public void testRemoveFromExistingObjectAfterGet() {
         obj.setDefaultData();
         obj.enumArr = null;
 
-        BinaryObjectBuilderImpl builder = builder(toPortable(obj));
+        BinaryObjectBuilderImpl builder = builder(toBinary(obj));
 
         builder.getField("i_");
 
@@ -987,7 +987,7 @@ public void testDontBrokeCyclicDependency() throws IgniteCheckedException {
         outer.inner.outer = outer;
         outer.foo = "a";
 
-        BinaryObjectBuilder builder = builder(toPortable(outer));
+        BinaryObjectBuilder builder = builder(toBinary(outer));
 
         builder.setField("foo", "b");
 
@@ -998,32 +998,32 @@ public void testDontBrokeCyclicDependency() throws IgniteCheckedException {
     }
 
     /**
-     * @return Portables.
+     * @return Binaries.
      */
-    private IgniteBinary portables() {
+    private IgniteBinary binaries() {
         return grid(0).binary();
     }
 
     /**
      * @param obj Object.
-     * @return Portable object.
+     * @return Binary object.
      */
-    private BinaryObject toPortable(Object obj) {
-        return portables().toBinary(obj);
+    private BinaryObject toBinary(Object obj) {
+        return binaries().toBinary(obj);
     }
 
     /**
      * @return Builder.
      */
     private BinaryObjectBuilder builder(String clsName) {
-        return portables().builder(clsName);
+        return binaries().builder(clsName);
     }
 
     /**
      * @return Builder.
      */
     private BinaryObjectBuilderImpl builder(BinaryObject obj) {
-        return (BinaryObjectBuilderImpl)portables().builder(obj);
+        return (BinaryObjectBuilderImpl)binaries().builder(obj);
     }
 
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
index 2528f17ce79ea..06406e0c9eb63 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
@@ -44,7 +44,7 @@
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
- * Test for portable object affinity key.
+ * Test for binary object affinity key.
  */
 public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
index c48b0568abde1..e433ec088e34e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
@@ -48,7 +48,7 @@ public void testObjectExchange() throws Exception {
 
         BinaryContext context = new BinaryContext(BinaryCachingMetadataHandler.create(), cfg);
 
-        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", context, cfg);
+        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", context, cfg);
 
         SimpleObject simpleObj = new SimpleObject();
 
@@ -68,12 +68,12 @@ public void testObjectExchange() throws Exception {
 
         assertEquals(simpleObj, marsh.unmarshal(marsh.marshal(simpleObj), null));
 
-        SimpleBinary simplePortable = new SimpleBinary();
+        SimpleBinary simpleBinary = new SimpleBinary();
 
-        simplePortable.str = "portable";
-        simplePortable.arr = new long[] {100, 200, 300};
+        simpleBinary.str = "binary";
+        simpleBinary.arr = new long[] {100, 200, 300};
 
-        assertEquals(simplePortable, marsh.unmarshal(marsh.marshal(simplePortable), null));
+        assertEquals(simpleBinary, marsh.unmarshal(marsh.marshal(simpleBinary), null));
 
         SimpleExternalizable simpleExtr = new SimpleExternalizable();
 
@@ -85,7 +85,7 @@ public void testObjectExchange() throws Exception {
 
     /**
      * Marshaller context with no storage. Platform has to work in such environment as well by marshalling class name of
-     * a portable object.
+     * a binary object.
      */
     private static class MarshallerContextWithNoStorage extends MarshallerContextAdapter {
         /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
index 970cbc73831a4..5c5d6c3f6a0ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
@@ -36,7 +36,7 @@
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
- * Portable meta data test.
+ * Binary meta data test.
  */
 public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
     /** */
@@ -74,9 +74,9 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
     }
 
     /**
-     * @return Portables API.
+     * @return Binaries API.
      */
-    protected IgniteBinary portables() {
+    protected IgniteBinary binaries() {
         return grid().binary();
     }
 
@@ -84,9 +84,9 @@ protected IgniteBinary portables() {
      * @throws Exception If failed.
      */
     public void testGetAll() throws Exception {
-        portables().toBinary(new TestObject2());
+        binaries().toBinary(new TestObject2());
 
-        Collection metas = portables().types();
+        Collection metas = binaries().types();
 
         assertEquals(2, metas.size());
 
@@ -150,16 +150,16 @@ public void testGetAll() throws Exception {
      * @throws Exception If failed.
      */
     public void testNoConfiguration() throws Exception {
-        portables().toBinary(new TestObject3());
+        binaries().toBinary(new TestObject3());
 
-        assertNotNull(portables().type(TestObject3.class));
+        assertNotNull(binaries().type(TestObject3.class));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testReflection() throws Exception {
-        BinaryType meta = portables().type(TestObject1.class);
+        BinaryType meta = binaries().type(TestObject1.class);
 
         assertNotNull(meta);
 
@@ -189,10 +189,10 @@ public void testReflection() throws Exception {
     /**
      * @throws Exception If failed.
      */
-    public void testPortableMarshalAware() throws Exception {
-        portables().toBinary(new TestObject2());
+    public void testBinaryMarshalAware() throws Exception {
+        binaries().toBinary(new TestObject2());
 
-        BinaryType meta = portables().type(TestObject2.class);
+        BinaryType meta = binaries().type(TestObject2.class);
 
         assertNotNull(meta);
 
@@ -223,13 +223,13 @@ public void testPortableMarshalAware() throws Exception {
      * @throws Exception If failed.
      */
     public void testMerge() throws Exception {
-        portables().toBinary(new TestObject2());
+        binaries().toBinary(new TestObject2());
 
         idx = 1;
 
-        portables().toBinary(new TestObject2());
+        binaries().toBinary(new TestObject2());
 
-        BinaryType meta = portables().type(TestObject2.class);
+        BinaryType meta = binaries().type(TestObject2.class);
 
         assertNotNull(meta);
 
@@ -274,7 +274,7 @@ public void testSerializedObject() throws Exception {
         obj.decVal = BigDecimal.ZERO;
         obj.decArrVal = new BigDecimal[] { BigDecimal.ONE };
 
-        BinaryObject po = portables().toBinary(obj);
+        BinaryObject po = binaries().toBinary(obj);
 
         info(po.toString());
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
index 9cf12428f58ca..dc70f4d43d7f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
@@ -40,19 +40,19 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testClassNames() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+        BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeIds = U.field(ctx, "userTypes");
 
         assertEquals(3, typeIds.size());
 
-        assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
-        assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode()));
         assertTrue(typeIds.containsKey("innerclass".hashCode()));
     }
 
@@ -60,7 +60,7 @@ public void testClassNames() throws Exception {
      * @throws Exception If failed.
      */
     public void testClassNamesWithMapper() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+        BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
             @SuppressWarnings("IfMayBeConditional")
             @Override public int typeId(String clsName) {
                 if (clsName.endsWith("1"))
@@ -81,14 +81,14 @@ else if (clsName.endsWith("InnerClass"))
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeMappers = U.field(ctx, "typeMappers");
 
         assertEquals(3, typeMappers.size());
 
-        assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
-        assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+        assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+        assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
         assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass"));
     }
 
@@ -96,19 +96,19 @@ else if (clsName.endsWith("InnerClass"))
      * @throws Exception If failed.
      */
     public void testTypeConfigurations() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+        BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeIds = U.field(ctx, "userTypes");
 
         assertEquals(3, typeIds.size());
 
-        assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
-        assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode()));
         assertTrue(typeIds.containsKey("innerclass".hashCode()));
     }
 
@@ -116,7 +116,7 @@ public void testTypeConfigurations() throws Exception {
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsWithGlobalMapper() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+        BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
             @SuppressWarnings("IfMayBeConditional")
             @Override public int typeId(String clsName) {
                 if (clsName.endsWith("1"))
@@ -137,14 +137,14 @@ else if (clsName.endsWith("InnerClass"))
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeMappers = U.field(ctx, "typeMappers");
 
         assertEquals(3, typeMappers.size());
 
-        assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
-        assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+        assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+        assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
         assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass"));
     }
 
@@ -152,7 +152,7 @@ else if (clsName.endsWith("InnerClass"))
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsWithNonGlobalMapper() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+        BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
             @SuppressWarnings("IfMayBeConditional")
             @Override public int typeId(String clsName) {
                 if (clsName.endsWith("1"))
@@ -173,14 +173,14 @@ else if (clsName.endsWith("InnerClass"))
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeMappers = U.field(ctx, "typeMappers");
 
         assertEquals(3, typeMappers.size());
 
-        assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
-        assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+        assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+        assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
         assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass"));
     }
 
@@ -190,7 +190,7 @@ else if (clsName.endsWith("InnerClass"))
     public void testOverride() throws Exception {
         BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration();
 
-        typeCfg.setTypeName("GridPortableTestClass2");
+        typeCfg.setTypeName("GridBinaryTestClass2");
         typeCfg.setIdMapper(new BinaryIdMapper() {
             @Override public int typeId(String clsName) {
                 return 100;
@@ -201,49 +201,49 @@ public void testOverride() throws Exception {
             }
         });
 
-        BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+        BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
             typeCfg));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeIds = U.field(ctx, "userTypes");
 
         assertEquals(3, typeIds.size());
 
-        assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
         assertTrue(typeIds.containsKey("innerclass".hashCode()));
-        assertFalse(typeIds.containsKey("gridportabletestclass2".hashCode()));
+        assertFalse(typeIds.containsKey("gridbinarytestclass2".hashCode()));
 
         Map typeMappers = U.field(ctx, "typeMappers");
 
-        assertEquals(100, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+        assertEquals(100, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testClassNamesJar() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+        BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeIds = U.field(ctx, "userTypes");
 
         assertEquals(3, typeIds.size());
 
-        assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
-        assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode()));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testClassNamesWithMapperJar() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+        BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
             @SuppressWarnings("IfMayBeConditional")
             @Override public int typeId(String clsName) {
                 if (clsName.endsWith("1"))
@@ -262,40 +262,40 @@ else if (clsName.endsWith("2"))
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeMappers = U.field(ctx, "typeMappers");
 
         assertEquals(3, typeMappers.size());
 
-        assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
-        assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+        assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+        assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsJar() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+        BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeIds = U.field(ctx, "userTypes");
 
         assertEquals(3, typeIds.size());
 
-        assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
-        assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode()));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsWithGlobalMapperJar() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+        BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
             @SuppressWarnings("IfMayBeConditional")
             @Override public int typeId(String clsName) {
                 if (clsName.endsWith("1"))
@@ -314,21 +314,21 @@ else if (clsName.endsWith("2"))
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeMappers = U.field(ctx, "typeMappers");
 
         assertEquals(3, typeMappers.size());
 
-        assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
-        assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+        assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+        assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsWithNonGlobalMapperJar() throws Exception {
-        BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+        BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
             @SuppressWarnings("IfMayBeConditional")
             @Override public int typeId(String clsName) {
                 if (clsName.endsWith("1"))
@@ -347,14 +347,14 @@ else if (clsName.endsWith("2"))
             new BinaryTypeConfiguration("unknown.*")
         ));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeMappers = U.field(ctx, "typeMappers");
 
         assertEquals(3, typeMappers.size());
 
-        assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
-        assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+        assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+        assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
     }
 
     /**
@@ -362,7 +362,7 @@ else if (clsName.endsWith("2"))
      */
     public void testOverrideJar() throws Exception {
         BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(
-            "org.apache.ignite.binary.testjar.GridPortableTestClass2");
+            "org.apache.ignite.binary.testjar.GridBinaryTestClass2");
 
         typeCfg.setIdMapper(new BinaryIdMapper() {
             @Override public int typeId(String clsName) {
@@ -374,30 +374,30 @@ public void testOverrideJar() throws Exception {
             }
         });
 
-        BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+        BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
             new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
             typeCfg));
 
-        BinaryContext ctx = portableContext(marsh);
+        BinaryContext ctx = binaryContext(marsh);
 
         Map typeIds = U.field(ctx, "userTypes");
 
         assertEquals(3, typeIds.size());
 
-        assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
+        assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
 
         Map typeMappers = U.field(ctx, "typeMappers");
 
         assertEquals(3, typeMappers.size());
 
-        assertEquals(100, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+        assertEquals(100, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
     }
 
     /**
      * @param marsh Marshaller.
-     * @return Portable context.
+     * @return Binary context.
      */
-    protected BinaryContext portableContext(BinaryMarshaller marsh) {
+    protected BinaryContext binaryContext(BinaryMarshaller marsh) {
         GridBinaryMarshaller impl = U.field(marsh, "impl");
 
         return impl.context();
@@ -406,36 +406,36 @@ protected BinaryContext portableContext(BinaryMarshaller marsh) {
     /**
      *
      */
-    protected BinaryMarshaller portableMarshaller()
+    protected BinaryMarshaller binaryMarshaller()
         throws IgniteCheckedException {
-        return portableMarshaller(null, null, null);
+        return binaryMarshaller(null, null, null);
     }
 
     /**
      *
      */
-    protected BinaryMarshaller portableMarshaller(Collection cfgs)
+    protected BinaryMarshaller binaryMarshaller(Collection cfgs)
         throws IgniteCheckedException {
-        return portableMarshaller(null, null, cfgs);
+        return binaryMarshaller(null, null, cfgs);
     }
 
     /**
      *
      */
-    protected BinaryMarshaller portableMarshaller(BinaryIdMapper mapper, Collection cfgs)
+    protected BinaryMarshaller binaryMarshaller(BinaryIdMapper mapper, Collection cfgs)
         throws IgniteCheckedException {
-        return portableMarshaller(mapper, null, cfgs);
+        return binaryMarshaller(mapper, null, cfgs);
     }
 
     /**
      *
      */
-    protected BinaryMarshaller portableMarshaller(BinarySerializer serializer, Collection cfgs)
+    protected BinaryMarshaller binaryMarshaller(BinarySerializer serializer, Collection cfgs)
         throws IgniteCheckedException {
-        return portableMarshaller(null, serializer, cfgs);
+        return binaryMarshaller(null, serializer, cfgs);
     }
 
-    protected BinaryMarshaller portableMarshaller(
+    protected BinaryMarshaller binaryMarshaller(
         BinaryIdMapper mapper,
         BinarySerializer serializer,
         Collection cfgs
@@ -457,7 +457,7 @@ protected BinaryMarshaller portableMarshaller(
 
         marsh.setContext(new MarshallerContextTestImpl(null));
 
-        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
 
         return marsh;
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
index 0170f99e2c6bd..ae615b15fee96 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
@@ -110,22 +110,22 @@ public static class TestObjectArrayList {
     /**
      *
      */
-    public static class TestObjectPlainPortable {
+    public static class TestObjectPlainBinary {
         /** */
-        public BinaryObject plainPortable;
+        public BinaryObject plainBinary;
 
         /**
          *
          */
-        public TestObjectPlainPortable() {
+        public TestObjectPlainBinary() {
             // No-op.
         }
 
         /**
-         * @param plainPortable Object.
+         * @param plainBinary Object.
          */
-        public TestObjectPlainPortable(BinaryObject plainPortable) {
-            this.plainPortable = plainPortable;
+        public TestObjectPlainBinary(BinaryObject plainBinary) {
+            this.plainBinary = plainBinary;
         }
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java
index 7687f382e0a76..c657cfd5523de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.binary.BinaryFieldsHeapSelfTest;
 
 /**
- * Field tests for heap-based portables with non-compact footer.
+ * Field tests for heap-based binaries with non-compact footer.
  */
 public class BinaryFieldsHeapNonCompactSelfTest extends BinaryFieldsHeapSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java
index 52bccd80dccef..f717f574762d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.binary.BinaryFieldsOffheapSelfTest;
 
 /**
- * Field tests for offheap-based portables with non-compact footer.
+ * Field tests for offheap-based binaries with non-compact footer.
  */
 public class BinaryFieldsOffheapNonCompactSelfTest extends BinaryFieldsOffheapSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java
index 279e4f0e783a2..14cc991e5fc69 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.binary.BinaryFooterOffsetsHeapSelfTest;
 
 /**
- * Compact offsets tests for heap portable objects with non-compact footer.
+ * Compact offsets tests for heap binary objects with non-compact footer.
  */
 public class BinaryFooterOffsetsHeapNonCompactSelfTest extends BinaryFooterOffsetsHeapSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java
index 66a8d1af3a84c..fe2929a289aa3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.binary.BinaryFooterOffsetsOffheapSelfTest;
 
 /**
- * Compact offsets tests for offheap portable objects with non-compact footer.
+ * Compact offsets tests for offheap binary objects with non-compact footer.
  */
 public class BinaryFooterOffsetsOffheapNonCompactSelfTest extends BinaryFooterOffsetsOffheapSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java
index 1305b6edba7c3..c6987834c3df6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.binary.BinaryObjectBuilderSelfTest;
 
 /**
- * Portable builder test for objects with non-compact footer.
+ * Binary builder test for objects with non-compact footer.
  */
 public class BinaryObjectBuilderNonCompactSelfTest extends BinaryObjectBuilderSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index 363b8e4748453..23d248d83c058 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@ -66,7 +66,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
     }
 
     /** {@inheritDoc} */
-    protected boolean portableEnabled() {
+    protected boolean binaryEnabled() {
         return false;
     }
 
@@ -444,14 +444,14 @@ private void checkPutGetRemoveObject(Integer key) throws Exception {
 
         TestValue val2 = new TestValue(new byte[10]);
 
-        if (portableEnabled()) // TODO: IGNITE-608, check return value when fixed.
+        if (binaryEnabled()) // TODO: IGNITE-608, check return value when fixed.
             c.put(key, val);
         else
             assertEquals(val, c.getAndPut(key, val));
 
         checkValue(key, val2);
 
-        if (portableEnabled()) // TODO: IGNITE-608, check return value when fixed.
+        if (binaryEnabled()) // TODO: IGNITE-608, check return value when fixed.
             c.remove(key);
         else
             assertEquals(val2, c.getAndRemove(key));
@@ -672,4 +672,4 @@ public TestValue(byte[] val) {
                 '}';
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
index b9c14498ca473..d29440e8a2ceb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
@@ -284,7 +284,7 @@ public void testPutGet() throws Exception {
 
         GridCacheContext cctx = cache0.context();
 
-        boolean binary = cctx.cacheObjects().isPortableEnabled(null);
+        boolean binary = cctx.cacheObjects().isBinaryEnabled(null);
 
         for (Map.Entry e : map.entrySet()) {
             GridCacheEntryEx entry = cache0.peekEx(e.getKey());
@@ -335,7 +335,7 @@ public void testPutGetByteArray() throws Exception {
 
         GridCacheContext cctx = cache0.context();
 
-        boolean binary = cctx.cacheObjects().isPortableEnabled(null);
+        boolean binary = cctx.cacheObjects().isBinaryEnabled(null);
 
         for (Map.Entry e : map.entrySet()) {
             GridCacheEntryEx entry = cache0.peekEx(e.getKey());
@@ -603,4 +603,4 @@ public void delegate(CacheInterceptor delegate) {
             this.delegate = delegate;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index a34e7df08aed7..f6eb430ab7bce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -474,7 +474,7 @@ public void recheckLock() {
         long ttl,
         boolean evt,
         boolean metrics,
-        boolean keepPortable,
+        boolean keepBinary,
         AffinityTopologyVersion topVer,
         CacheEntryPredicate[] filter,
         GridDrType drType,
@@ -497,7 +497,7 @@ public void recheckLock() {
         boolean writeThrough,
         boolean readThrough,
         boolean retval,
-        boolean keepPortable,
+        boolean keepBinary,
         @Nullable ExpiryPolicy expiryPlc,
         boolean evt,
         boolean metrics,
@@ -520,7 +520,7 @@ public void recheckLock() {
         boolean writeThrough,
         boolean readThrough,
         boolean retval,
-        boolean keepPortable,
+        boolean keepBinary,
         @Nullable IgniteCacheExpiryPolicy expiryPlc,
         boolean evt,
         boolean metrics,
@@ -552,7 +552,7 @@ public void recheckLock() {
         boolean retval,
         boolean evt,
         boolean metrics,
-        boolean keepPortable,
+        boolean keepBinary,
         AffinityTopologyVersion topVer,
         CacheEntryPredicate[] filter,
         GridDrType drType,
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
index 128e316c629f0..d1f782686d1c9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
@@ -41,7 +41,7 @@ public class GridBinaryCacheEntryMemorySizeSelfTest extends GridCacheEntryMemory
 
         BinaryContext pCtx = new BinaryContext(BinaryNoopMetadataHandler.instance(), iCfg);
 
-        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", pCtx, iCfg);
+        IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", pCtx, iCfg);
 
         return marsh;
     }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java
index 9306958aa05dd..a3f8055cc9fc6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java
@@ -35,7 +35,7 @@
 import org.apache.ignite.binary.BinaryObject;
 
 /**
- * Tests that portable object is the same in cache entry and in index.
+ * Tests that binary object is the same in cache entry and in index.
  */
 public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends GridCacheAbstractSelfTest {
     /** {@inheritDoc} */
@@ -49,7 +49,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
 
         BinaryConfiguration bCfg = new BinaryConfiguration();
 
-        bCfg.setClassNames(Collections.singletonList(TestPortable.class.getName()));
+        bCfg.setClassNames(Collections.singletonList(TestBinary.class.getName()));
 
         cfg.setBinaryConfiguration(bCfg);
 
@@ -67,7 +67,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
         CacheTypeMetadata meta = new CacheTypeMetadata();
 
         meta.setKeyType(Integer.class);
-        meta.setValueType(TestPortable.class.getName());
+        meta.setValueType(TestBinary.class.getName());
 
         Map> idx = new HashMap<>();
 
@@ -91,13 +91,13 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
      * @throws Exception If failed.
      */
     public void testIndexReferences() throws Exception {
-        IgniteCache cache = grid(0).cache(null);
+        IgniteCache cache = grid(0).cache(null);
 
         String fieldOneVal = "123";
         int fieldTwoVal = 123;
         int key = 0;
 
-        cache.put(key, new TestPortable(fieldOneVal, fieldTwoVal));
+        cache.put(key, new TestBinary(fieldOneVal, fieldTwoVal));
 
         IgniteCache prj = grid(0).cache(null).withKeepBinary();
 
@@ -107,7 +107,7 @@ public void testIndexReferences() throws Exception {
         assertEquals(new Integer(fieldTwoVal), cacheVal.field("fieldTwo"));
 
         List row = F.first(prj.query(new SqlFieldsQuery("select _val from " +
-            "TestPortable where _key = ?").setArgs(key)).getAll());
+            "TestBinary where _key = ?").setArgs(key)).getAll());
 
         assertEquals(1, row.size());
 
@@ -119,9 +119,9 @@ public void testIndexReferences() throws Exception {
     }
 
     /**
-     * Test portable object.
+     * Test binary object.
      */
-    private static class TestPortable {
+    private static class TestBinary {
         /** */
         private String fieldOne;
 
@@ -131,7 +131,7 @@ private static class TestPortable {
         /**
          *
          */
-        private TestPortable() {
+        private TestBinary() {
             // No-op.
         }
 
@@ -139,7 +139,7 @@ private TestPortable() {
          * @param fieldOne Field one.
          * @param fieldTwo Field two.
          */
-        private TestPortable(String fieldOne, int fieldTwo) {
+        private TestBinary(String fieldOne, int fieldTwo) {
             this.fieldOne = fieldOne;
             this.fieldTwo = fieldTwo;
         }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
index 5840149a93843..beb76d19204b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
@@ -43,7 +43,7 @@
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public abstract class GridCacheBinaryObjectsAbstractDataStreamerSelfTest extends GridCommonAbstractTest {
     /** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
index 043f24f63adee..0f73b53e5e54e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
@@ -49,7 +49,7 @@
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extends GridCommonAbstractTest {
     /** */
@@ -146,11 +146,11 @@ protected int gridCount() {
 
                         switch (threadId) {
                             case 0:
-                                // Put/get/remove portable -> portable.
+                                // Put/get/remove binary -> binary.
 
                                 c.put(new TestObject(rnd.nextInt(10000)), new TestObject(rnd.nextInt(10000)));
 
-                                IgniteCache p2 = ((IgniteCacheProxy)c).keepPortable();
+                                IgniteCache p2 = ((IgniteCacheProxy)c).keepBinary();
 
                                 BinaryObject v = (BinaryObject)p2.get(new TestObject(rnd.nextInt(10000)));
 
@@ -162,10 +162,10 @@ protected int gridCount() {
                                 break;
 
                             case 1:
-                                // Put/get int -> portable.
+                                // Put/get int -> binary.
                                 c.put(rnd.nextInt(10000), new TestObject(rnd.nextInt(10000)));
 
-                                IgniteCache p4 = ((IgniteCacheProxy)c).keepPortable();
+                                IgniteCache p4 = ((IgniteCacheProxy)c).keepBinary();
 
                                 BinaryObject v1 = p4.get(rnd.nextInt(10000));
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
index d24e1e4023a54..2da781b512fec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
@@ -68,7 +68,7 @@
 import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonAbstractTest {
     /** */
@@ -184,7 +184,7 @@ protected boolean offheapTiered() {
      */
     @SuppressWarnings("unchecked")
     public void testCircularReference() throws Exception {
-        IgniteCache c = keepPortableCache();
+        IgniteCache c = keepBinaryCache();
 
         TestReferenceObject obj1 = new TestReferenceObject();
 
@@ -229,7 +229,7 @@ public void testGet() throws Exception {
             assertEquals(i, obj.val);
         }
 
-        IgniteCache kpc = keepPortableCache();
+        IgniteCache kpc = keepBinaryCache();
 
         for (int i = 0; i < ENTRY_CNT; i++) {
             BinaryObject po = kpc.get(i);
@@ -254,7 +254,7 @@ public void testIterator() throws Exception {
             entries.put(i, val);
         }
 
-        IgniteCache prj = ((IgniteCacheProxy)c).keepPortable();
+        IgniteCache prj = ((IgniteCacheProxy)c).keepBinary();
 
         Iterator> it = prj.iterator();
 
@@ -306,7 +306,7 @@ public void testCollection() throws Exception {
             }
         }
 
-        IgniteCache> kpc = keepPortableCache();
+        IgniteCache> kpc = keepBinaryCache();
 
         for (int i = 0; i < ENTRY_CNT; i++) {
             Collection col = kpc.get(i);
@@ -353,7 +353,7 @@ public void testMap() throws Exception {
             }
         }
 
-        IgniteCache> kpc = keepPortableCache();
+        IgniteCache> kpc = keepBinaryCache();
 
         for (int i = 0; i < ENTRY_CNT; i++) {
             Map map = kpc.get(i);
@@ -389,14 +389,14 @@ public void testGetAsync() throws Exception {
             assertEquals(i, obj.val);
         }
 
-        IgniteCache kpc = keepPortableCache();
+        IgniteCache kpc = keepBinaryCache();
 
-        IgniteCache cachePortableAsync = kpc.withAsync();
+        IgniteCache cacheBinaryAsync = kpc.withAsync();
 
         for (int i = 0; i < ENTRY_CNT; i++) {
-            cachePortableAsync.get(i);
+            cacheBinaryAsync.get(i);
 
-            BinaryObject po = cachePortableAsync.future().get();
+            BinaryObject po = cacheBinaryAsync.future().get();
 
             assertEquals(i, (int)po.field("val"));
         }
@@ -434,7 +434,7 @@ public void testGetTx() throws Exception {
             }
         }
 
-        IgniteCache kpc = keepPortableCache();
+        IgniteCache kpc = keepBinaryCache();
 
         for (int i = 0; i < ENTRY_CNT; i++) {
             try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
@@ -483,14 +483,14 @@ public void testGetAsyncTx() throws Exception {
             }
         }
 
-        IgniteCache kpc = keepPortableCache();
-        IgniteCache cachePortableAsync = kpc.withAsync();
+        IgniteCache kpc = keepBinaryCache();
+        IgniteCache cacheBinaryAsync = kpc.withAsync();
 
         for (int i = 0; i < ENTRY_CNT; i++) {
             try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
-                cachePortableAsync.get(i);
+                cacheBinaryAsync.get(i);
 
-                BinaryObject po = cachePortableAsync.future().get();
+                BinaryObject po = cacheBinaryAsync.future().get();
 
                 assertEquals(i, (int)po.field("val"));
 
@@ -522,7 +522,7 @@ public void testGetAll() throws Exception {
                 assertEquals(e.getKey().intValue(), e.getValue().val);
         }
 
-        IgniteCache kpc = keepPortableCache();
+        IgniteCache kpc = keepBinaryCache();
 
         for (int i = 0; i < ENTRY_CNT; ) {
             Set keys = new HashSet<>();
@@ -566,8 +566,8 @@ public void testGetAllAsync() throws Exception {
                 assertEquals(e.getKey().intValue(), e.getValue().val);
         }
 
-        IgniteCache kpc = keepPortableCache();
-        IgniteCache cachePortableAsync = kpc.withAsync();
+        IgniteCache kpc = keepBinaryCache();
+        IgniteCache cacheBinaryAsync = kpc.withAsync();
 
         for (int i = 0; i < ENTRY_CNT; ) {
             Set keys = new HashSet<>();
@@ -576,9 +576,9 @@ public void testGetAllAsync() throws Exception {
                 keys.add(i++);
 
 
-            cachePortableAsync.getAll(keys);
+            cacheBinaryAsync.getAll(keys);
 
-            Map objs = cachePortableAsync.>future().get();
+            Map objs = cacheBinaryAsync.>future().get();
 
             assertEquals(10, objs.size());
 
@@ -628,7 +628,7 @@ public void testGetAllTx() throws Exception {
             }
         }
 
-        IgniteCache kpc = keepPortableCache();
+        IgniteCache kpc = keepBinaryCache();
 
         for (int i = 0; i < ENTRY_CNT; ) {
             Set keys = new HashSet<>();
@@ -693,7 +693,7 @@ public void testGetAllAsyncTx() throws Exception {
             }
         }
 
-        IgniteCache cache = keepPortableCache();
+        IgniteCache cache = keepBinaryCache();
 
         for (int i = 0; i < ENTRY_CNT; ) {
             Set keys = new HashSet<>();
@@ -785,7 +785,7 @@ public void testLoadCacheFilteredAsync() throws Exception {
      * @throws Exception If failed.
      */
     public void testTransform() throws Exception {
-        IgniteCache c = keepPortableCache();
+        IgniteCache c = keepBinaryCache();
 
         checkTransform(primaryKey(c));
 
@@ -798,9 +798,9 @@ public void testTransform() throws Exception {
     }
 
     /**
-     * @return Cache with keep portable flag.
+     * @return Cache with keep binary flag.
      */
-    private  IgniteCache keepPortableCache() {
+    private  IgniteCache keepBinaryCache() {
         return ignite(0).cache(null).withKeepBinary();
     }
 
@@ -811,7 +811,7 @@ private  IgniteCache keepPortableCache() {
     private void checkTransform(Integer key) throws Exception {
         log.info("Transform: " + key);
 
-        IgniteCache c = keepPortableCache();
+        IgniteCache c = keepBinaryCache();
 
         try {
             c.invoke(key, new EntryProcessor() {
@@ -836,9 +836,9 @@ private void checkTransform(Integer key) throws Exception {
 
                     Ignite ignite = e.unwrap(Ignite.class);
 
-                    IgniteBinary portables = ignite.binary();
+                    IgniteBinary binaries = ignite.binary();
 
-                    BinaryObjectBuilder builder = portables.builder(val);
+                    BinaryObjectBuilder builder = binaries.builder(val);
 
                     builder.setField("val", 2);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
index 058dc0b14bb46..4f478f728087b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
@@ -62,7 +62,7 @@ public abstract class GridCacheBinaryStoreAbstractSelfTest extends GridCommonAbs
         CacheConfiguration cacheCfg = new CacheConfiguration();
 
         cacheCfg.setCacheStoreFactory(singletonFactory(STORE));
-        cacheCfg.setKeepBinaryInStore(keepPortableInStore());
+        cacheCfg.setKeepBinaryInStore(keepBinaryInStore());
         cacheCfg.setReadThrough(true);
         cacheCfg.setWriteThrough(true);
         cacheCfg.setLoadPreviousValue(true);
@@ -81,7 +81,7 @@ public abstract class GridCacheBinaryStoreAbstractSelfTest extends GridCommonAbs
     /**
      * @return Keep binary in store flag.
      */
-    protected abstract boolean keepPortableInStore();
+    protected abstract boolean keepBinaryInStore();
 
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java
index 55f2da00936c3..4d163b30c077b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java
@@ -24,7 +24,7 @@
  */
 public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected boolean keepPortableInStore() {
+    @Override protected boolean keepBinaryInStore() {
         return true;
     }
 
@@ -34,7 +34,7 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb
         assert idxs != null;
 
         for (int idx : idxs)
-            map.put(portable(new Key(idx)), portable(new Value(idx)));
+            map.put(binary(new Key(idx)), binary(new Value(idx)));
     }
 
     /** {@inheritDoc} */
@@ -45,7 +45,7 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb
         assertEquals(idxs.length, map.size());
 
         for (int idx : idxs) {
-            Object val = map.get(portable(new Key(idx)));
+            Object val = map.get(binary(new Key(idx)));
 
             assertTrue(String.valueOf(val), val instanceof BinaryObject);
 
@@ -58,9 +58,9 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb
 
     /**
      * @param obj Object.
-     * @return Portable object.
+     * @return Binary object.
      */
-    private Object portable(Object obj) {
+    private Object binary(Object obj) {
         return grid().binary().toBinary(obj);
     }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java
index a4d08ec848625..1096c15e8bd61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java
@@ -24,7 +24,7 @@
  */
 public class GridCacheBinaryStoreObjectsSelfTest extends GridCacheBinaryStoreAbstractSelfTest {
     /** {@inheritDoc} */
-    @Override protected boolean keepPortableInStore() {
+    @Override protected boolean keepBinaryInStore() {
         return false;
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
index 004494ed452e1..fee302bb4bfaa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
@@ -96,10 +96,10 @@ public void testClientMetadataInitialization() throws Exception {
         IgniteInternalFuture fut;
 
         try {
-            // Update portable metadata concurrently with client nodes start.
+            // Update binary metadata concurrently with client nodes start.
             fut = GridTestUtils.runMultiThreadedAsync(new Callable() {
                 @Override public Object call() throws Exception {
-                    IgniteBinary portables = ignite(0).binary();
+                    IgniteBinary binaries = ignite(0).binary();
 
                     IgniteCache cache = ignite(0).cache(null).withKeepBinary();
 
@@ -108,12 +108,12 @@ public void testClientMetadataInitialization() throws Exception {
                     for (int i = 0; i < 1000; i++) {
                         log.info("Iteration: " + i);
 
-                        String type = "portable-type-" + i;
+                        String type = "binary-type-" + i;
 
                         allTypes.add(type);
 
                         for (int f = 0; f < 10; f++) {
-                            BinaryObjectBuilder builder = portables.builder(type);
+                            BinaryObjectBuilder builder = binaries.builder(type);
 
                             String fieldName = "f" + f;
 
@@ -145,7 +145,7 @@ public void testClientMetadataInitialization() throws Exception {
 
         assertFalse(allTypes.isEmpty());
 
-        log.info("Expected portable types: " + allTypes.size());
+        log.info("Expected binary types: " + allTypes.size());
 
         assertEquals(7, ignite(0).cluster().nodes().size());
 
@@ -156,9 +156,9 @@ public void testClientMetadataInitialization() throws Exception {
 
             assertEquals((Object)client, ignite(i).configuration().isClientMode());
 
-            IgniteBinary portables = ignite(i).binary();
+            IgniteBinary binaries = ignite(i).binary();
 
-            Collection metaCol = portables.types();
+            Collection metaCol = binaries.types();
 
             assertEquals(allTypes.size(), metaCol.size());
 
@@ -182,12 +182,12 @@ public void testClientMetadataInitialization() throws Exception {
     public void testFailoverOnStart() throws Exception {
         startGrids(4);
 
-        IgniteBinary portables = ignite(0).binary();
+        IgniteBinary binaries = ignite(0).binary();
 
         IgniteCache cache = ignite(0).cache(null).withKeepBinary();
 
         for (int i = 0; i < 1000; i++) {
-            BinaryObjectBuilder builder = portables.builder("type-" + i);
+            BinaryObjectBuilder builder = binaries.builder("type-" + i);
 
             builder.setField("f0", i);
 
@@ -232,9 +232,9 @@ public void testFailoverOnStart() throws Exception {
 
             assertEquals((Object) client, ignite(i).configuration().isClientMode());
 
-            portables = ignite(i).binary();
+            binaries = ignite(i).binary();
 
-            final IgniteBinary p0 = portables;
+            final IgniteBinary p0 = binaries;
 
             GridTestUtils.waitForCondition(new GridAbsPredicate() {
                 @Override public boolean apply() {
@@ -244,7 +244,7 @@ public void testFailoverOnStart() throws Exception {
                 }
             }, getTestTimeout());
 
-            Collection metaCol = portables.types();
+            Collection metaCol = binaries.types();
 
             assertEquals(1000, metaCol.size());
 
@@ -278,12 +278,12 @@ public void testClientStartsFirst() throws Exception {
 
         assertFalse(ignite1.configuration().isClientMode());
 
-        IgniteBinary portables = ignite(1).binary();
+        IgniteBinary binaries = ignite(1).binary();
 
         IgniteCache cache = ignite(1).cache(null).withKeepBinary();
 
         for (int i = 0; i < 100; i++) {
-            BinaryObjectBuilder builder = portables.builder("type-" + i);
+            BinaryObjectBuilder builder = binaries.builder("type-" + i);
 
             builder.setField("f0", i);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java
index 2a717481598c0..b91b0882dc1e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java
@@ -94,7 +94,7 @@ public class GridCacheClientNodeBinaryObjectMetadataTest extends GridCacheAbstra
     /**
      * @throws Exception If failed.
      */
-    public void testPortableMetadataOnClient() throws Exception {
+    public void testBinaryMetadataOnClient() throws Exception {
         Ignite ignite0 = ignite(gridCount() - 1);
 
         assertTrue(ignite0.configuration().isClientMode());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
index 125a055962d31..4caa5fb3ef442 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
@@ -55,7 +55,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
     private static final int KEYS_COUNT = 1000;
 
     /** Flag indicating should be cache configured with binary or not.  */
-    private static boolean portables;
+    private static boolean binaries;
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
@@ -66,7 +66,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        if (portables) {
+        if (binaries) {
             BinaryMarshaller marsh = new BinaryMarshaller();
 
             cfg.setMarshaller(marsh);
@@ -101,7 +101,7 @@ private CacheConfiguration cacheConfiguration() {
      */
     public void testAddDataFromMap() throws Exception {
         try {
-            portables = false;
+            binaries = false;
 
             startGrids(2);
 
@@ -143,13 +143,13 @@ public void testAddDataFromMap() throws Exception {
     }
 
     /**
-     * Data streamer should add portable object that weren't registered explicitly.
+     * Data streamer should add binary object that weren't registered explicitly.
      *
      * @throws Exception If failed.
      */
-    public void testAddMissingPortable() throws Exception {
+    public void testAddMissingBinary() throws Exception {
         try {
-            portables = true;
+            binaries = true;
 
             startGrids(2);
 
@@ -177,14 +177,14 @@ public void testAddMissingPortable() throws Exception {
     }
 
     /**
-     * Data streamer should correctly load portable entries from HashMap in case of grids with more than one node
+     * Data streamer should correctly load binary entries from HashMap in case of grids with more than one node
      *  and with GridOptimizedMarshaller that requires serializable.
      *
      * @throws Exception If failed.
      */
-    public void testAddPortableDataFromMap() throws Exception {
+    public void testAddBinaryDataFromMap() throws Exception {
         try {
-            portables = true;
+            binaries = true;
 
             startGrids(2);
 
@@ -220,8 +220,8 @@ public void testAddPortableDataFromMap() throws Exception {
                 assertEquals(k, v.val());
             }
 
-            // Read random keys. Take values as PortableObject.
-            IgniteCache c2 = ((IgniteCacheProxy)c).keepPortable();
+            // Read random keys. Take values as BinaryObject.
+            IgniteCache c2 = ((IgniteCacheProxy)c).keepBinary();
 
             for (int i = 0; i < 100; i ++) {
                 Integer k = rnd.nextInt(KEYS_COUNT);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java
index 0199217506645..db57cf9314d6a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java
@@ -26,7 +26,7 @@
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public class GridCacheBinaryObjectsAtomicNearDisabledSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java
index fcdd184778f62..7501abca159d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java
@@ -26,7 +26,7 @@
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public class GridCacheBinaryObjectsAtomicSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java
index dc439d79a8fd8..a512bdf272c24 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java
@@ -26,7 +26,7 @@
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public class GridCacheBinaryObjectsPartitionedNearDisabledSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java
index 550ae3f195860..341b571e6da1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java
@@ -26,7 +26,7 @@
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public class GridCacheBinaryObjectsPartitionedSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java
index 3494b5c8a791e..d9b4663a607a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java
@@ -28,7 +28,7 @@
  */
 public class GridCacheOffHeapTieredAtomicBinarySelfTest extends GridCacheOffHeapTieredAtomicSelfTest {
     /** {@inheritDoc} */
-    @Override protected boolean portableEnabled() {
+    @Override protected boolean binaryEnabled() {
         return true;
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java
index 7cde9e794be0b..abfc7394fc507 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java
@@ -28,7 +28,7 @@
  */
 public class GridCacheOffHeapTieredBinarySelfTest extends GridCacheOffHeapTieredSelfTest {
     /** {@inheritDoc} */
-    @Override protected boolean portableEnabled() {
+    @Override protected boolean binaryEnabled() {
         return true;
     }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java
index 79fe8d39abbf3..aec896a02cf48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java
@@ -44,24 +44,24 @@ public class GridCacheOffHeapTieredEvictionAtomicBinarySelfTest extends GridCach
 
     /** {@inheritDoc} */
     @Override protected TestPredicate testPredicate(String expVal, boolean acceptNull) {
-        return new PortableValuePredicate(expVal, acceptNull);
+        return new BinaryValuePredicate(expVal, acceptNull);
     }
 
     /** {@inheritDoc} */
     @Override protected TestProcessor testClosure(String expVal, boolean acceptNull) {
-        return new PortableValueClosure(expVal, acceptNull);
+        return new BinaryValueClosure(expVal, acceptNull);
     }
 
     /**
      *
      */
     @SuppressWarnings("PackageVisibleInnerClass")
-    static class PortableValuePredicate extends TestPredicate {
+    static class BinaryValuePredicate extends TestPredicate {
         /**
          * @param expVal Expected value.
          * @param acceptNull If {@code true} value can be null;
          */
-        PortableValuePredicate(String expVal, boolean acceptNull) {
+        BinaryValuePredicate(String expVal, boolean acceptNull) {
             super(expVal, acceptNull);
         }
 
@@ -77,12 +77,12 @@ static class PortableValuePredicate extends TestPredicate {
      *
      */
     @SuppressWarnings("PackageVisibleInnerClass")
-    static class PortableValueClosure extends TestProcessor {
+    static class BinaryValueClosure extends TestProcessor {
         /**
          * @param expVal Expected value.
          * @param acceptNull If {@code true} value can be null;
          */
-        PortableValueClosure(String expVal, boolean acceptNull) {
+        BinaryValueClosure(String expVal, boolean acceptNull) {
             super(expVal, acceptNull);
         }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java
index 9a47e4f98568b..3138eb73d4ebd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java
@@ -44,24 +44,24 @@ public class GridCacheOffHeapTieredEvictionBinarySelfTest extends GridCacheOffHe
 
     /** {@inheritDoc} */
     @Override protected TestPredicate testPredicate(String expVal, boolean acceptNull) {
-        return new PortableValuePredicate(expVal, acceptNull);
+        return new BinaryValuePredicate(expVal, acceptNull);
     }
 
     /** {@inheritDoc} */
     @Override protected TestProcessor testClosure(String expVal, boolean acceptNull) {
-        return new PortableValueClosure(expVal, acceptNull);
+        return new BinaryValueClosure(expVal, acceptNull);
     }
 
     /**
      *
      */
     @SuppressWarnings("PackageVisibleInnerClass")
-    static class PortableValuePredicate extends TestPredicate {
+    static class BinaryValuePredicate extends TestPredicate {
         /**
          * @param expVal Expected value.
          * @param acceptNull If {@code true} value can be null;
          */
-        PortableValuePredicate(String expVal, boolean acceptNull) {
+        BinaryValuePredicate(String expVal, boolean acceptNull) {
             super(expVal, acceptNull);
         }
 
@@ -77,12 +77,12 @@ static class PortableValuePredicate extends TestPredicate {
      *
      */
     @SuppressWarnings("PackageVisibleInnerClass")
-    static class PortableValueClosure extends TestProcessor {
+    static class BinaryValueClosure extends TestProcessor {
         /**
          * @param expVal Expected value.
          * @param acceptNull If {@code true} value can be null;
          */
-        PortableValueClosure(String expVal, boolean acceptNull) {
+        BinaryValueClosure(String expVal, boolean acceptNull) {
             super(expVal, acceptNull);
         }
 
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java
index 90f060f3d970c..719c5645b66b4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java
@@ -26,7 +26,7 @@
 import static org.apache.ignite.cache.CacheMode.REPLICATED;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public class GridCacheBinaryObjectsReplicatedSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java
index fc38561bcd5ae..271218109f068 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java
@@ -26,7 +26,7 @@
 import static org.apache.ignite.cache.CacheMode.LOCAL;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public class GridCacheBinaryObjectsLocalSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
     /** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java
index a28488395fe74..03ab998de35ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java
@@ -74,17 +74,17 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter
     /** Type: map. */
     private static final int TYPE_MAP = 11;
 
-    /** Type: portable object which exists in all platforms. */
-    private static final int TYPE_PORTABLE = 12;
+    /** Type: binary object which exists in all platforms. */
+    private static final int TYPE_BINARY = 12;
 
-    /** Type: portable object which exists only in Java. */
-    private static final int TYPE_PORTABLE_JAVA = 13;
+    /** Type: binary object which exists only in Java. */
+    private static final int TYPE_BINARY_JAVA = 13;
 
     /** Type: object array. */
     private static final int TYPE_OBJ_ARRAY = 14;
 
-    /** Type: portable object array. */
-    private static final int TYPE_PORTABLE_ARRAY = 15;
+    /** Type: binary object array. */
+    private static final int TYPE_BINARY_ARRAY = 15;
 
     /** Type: enum. */
     private static final int TYPE_ENUM = 16;
@@ -165,16 +165,16 @@ public EchoJob(Integer type) {
                 case TYPE_MAP:
                     return Collections.singletonMap(1, 1);
 
-                case TYPE_PORTABLE:
+                case TYPE_BINARY:
                     return new PlatformComputeBinarizable(1);
 
-                case TYPE_PORTABLE_JAVA:
+                case TYPE_BINARY_JAVA:
                     return new PlatformComputeJavaBinarizable(1);
 
                 case TYPE_OBJ_ARRAY:
                     return new String[] { "foo", "bar", "baz" };
 
-                case TYPE_PORTABLE_ARRAY:
+                case TYPE_BINARY_ARRAY:
                     return new PlatformComputeBinarizable[] {
                         new PlatformComputeBinarizable(1),
                         new PlatformComputeBinarizable(2),
@@ -203,4 +203,4 @@ public EchoJob(Integer type) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
index f3374c4fc775e..3038cba9e4c57 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
@@ -102,7 +102,7 @@ public void testCacheCheckpoint() throws Exception {
 
             marsh.setContext(new MarshallerContextTestImpl(null));
 
-            IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, cfg);
+            IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, cfg);
         }
 
         GridSessionCheckpointSelfTest.spi = spi;
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 67a4f20d4bcc4..4e3f326c93f12 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -266,7 +266,7 @@ public static synchronized Marshaller getMarshaller() throws IgniteCheckedExcept
         if (marsh instanceof BinaryMarshaller) {
             BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration());
 
-            IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, new IgniteConfiguration());
+            IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, new IgniteConfiguration());
         }
 
         return marsh;
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java
index 3dc78cc8c8cb9..e891d35a59d73 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java
@@ -22,7 +22,7 @@
 import org.apache.ignite.testframework.config.GridTestProperties;
 
 /**
- * Cache full API suite with portable marshaller.
+ * Cache full API suite with binary marshaller.
  */
 public class IgniteBinaryCacheFullApiTestSuite extends TestSuite {
     /**
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
index 729bebe5f9bd0..982bd4cd837c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
@@ -47,7 +47,7 @@
 import org.apache.ignite.testframework.config.GridTestProperties;
 
 /**
- * Cache suite with portable marshaller.
+ * Cache suite with binary marshaller.
  */
 public class IgniteBinaryCacheTestSuite extends TestSuite {
     /**
@@ -57,11 +57,11 @@ public class IgniteBinaryCacheTestSuite extends TestSuite {
     public static TestSuite suite() throws Exception {
         GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName());
 
-        TestSuite suite = new TestSuite("Portable Cache Test Suite");
+        TestSuite suite = new TestSuite("Binary Cache Test Suite");
 
         HashSet ignoredTests = new HashSet<>();
 
-        // Tests below have a special version for Portable Marshaller
+        // Tests below have a special version for Binary Marshaller
         ignoredTests.add(DataStreamProcessorSelfTest.class);
         ignoredTests.add(GridCacheOffHeapTieredEvictionAtomicSelfTest.class);
         ignoredTests.add(GridCacheOffHeapTieredEvictionSelfTest.class);
@@ -71,7 +71,7 @@ public static TestSuite suite() throws Exception {
         ignoredTests.add(IgniteCacheAtomicLocalExpiryPolicyTest.class);
         ignoredTests.add(GridCacheEntryMemorySizeSelfTest.class);
 
-        // Tests that are not ready to be used with PortableMarshaller
+        // Tests that are not ready to be used with BinaryMarshaller
         ignoredTests.add(GridCacheMvccSelfTest.class);
 
         suite.addTest(IgniteCacheTestSuite.suite(ignoredTests));
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
index 7a6a0a69dd98d..d80478b2fc247 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
@@ -34,7 +34,7 @@ public class IgniteBinaryObjectsCacheTestSuite3 {
     public static TestSuite suite() throws Exception {
         GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName());
         GridTestProperties.setProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME,
-            "org.apache.ignite.tests.p2p.CacheDeploymentPortableEntryProcessor");
+            "org.apache.ignite.tests.p2p.CacheDeploymentBinaryEntryProcessor");
 
         TestSuite suite = IgniteCacheTestSuite3.suite();
 
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 271ff33902aed..2b0ad63082a3f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -56,7 +56,7 @@
 import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalSelfTest;
 
 /**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
  */
 public class IgniteBinaryObjectsTestSuite extends TestSuite {
     /**
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 1437a160b47df..8625be9d24af3 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -519,13 +519,13 @@ private void onSqlException() {
 
     /**
      * @param o Object.
-     * @return {@code true} If it is a portable object.
+     * @return {@code true} If it is a binary object.
      */
-    private boolean isPortable(CacheObject o) {
+    private boolean isBinary(CacheObject o) {
         if (ctx == null)
             return false;
 
-        return ctx.cacheObjects().isPortableObject(o);
+        return ctx.cacheObjects().isBinaryObject(o);
     }
 
     /**
@@ -534,7 +534,7 @@ private boolean isPortable(CacheObject o) {
      * @return Object class.
      */
     private Class getClass(CacheObjectContext coctx, CacheObject o) {
-        return isPortable(o) ?
+        return isBinary(o) ?
             Object.class :
             o.value(coctx, false).getClass();
     }
@@ -1045,7 +1045,7 @@ public void bindParameters(PreparedStatement stmt, @Nullable Collection
 
         twoStepQry.pageSize(qry.getPageSize());
 
-        QueryCursorImpl> cursor = new QueryCursorImpl<>(queryTwoStep(cctx, twoStepQry, cctx.keepPortable()));
+        QueryCursorImpl> cursor = new QueryCursorImpl<>(queryTwoStep(cctx, twoStepQry, cctx.keepBinary()));
 
         cursor.fieldsMeta(meta);
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 1d4fa304003b3..828d9bd1d5f27 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -448,10 +448,10 @@ else if (!cctx.isReplicated() && !extraCctx.isReplicated()) {
     /**
      * @param cctx Cache context.
      * @param qry Query.
-     * @param keepPortable Keep portable.
+     * @param keepBinary Keep binary.
      * @return Cursor.
      */
-    public Iterator> query(GridCacheContext cctx, GridCacheTwoStepQuery qry, boolean keepPortable) {
+    public Iterator> query(GridCacheContext cctx, GridCacheTwoStepQuery qry, boolean keepBinary) {
         for (int attempt = 0;; attempt++) {
             if (attempt != 0) {
                 try {
@@ -652,7 +652,7 @@ public Iterator> query(GridCacheContext cctx, GridCacheTwoStepQuery
                     continue;
                 }
 
-                return new GridQueryCacheObjectsIterator(resIter, cctx, keepPortable);
+                return new GridQueryCacheObjectsIterator(resIter, cctx, keepBinary);
             }
             catch (IgniteCheckedException | RuntimeException e) {
                 U.closeQuiet(r.conn);
@@ -1240,4 +1240,4 @@ protected Iter(ResultSet data) throws IgniteCheckedException {
             return res;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index a92451fc77a2d..64a11156971a8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
         try {
             jcache(0).query(new SqlQuery(String.class, "field like '" + key + "'")).getAll();
 
-            assertTrue("p2p marshalling failed, but error response was not sent", portableMarshaller());
+            assertTrue("p2p marshalling failed, but error response was not sent", binaryMarshaller());
         }
         catch (CacheException e) {
-            assertFalse("Unexpected exception: " + e, portableMarshaller());
+            assertFalse("Unexpected exception: " + e, binaryMarshaller());
         }
     }
 
@@ -78,20 +78,20 @@ private void readObject(ObjectInputStream is) throws IOException {
                 }
             })).getAll();
 
-            assertTrue("Request unmarshalling failed, but error response was not sent.", portableMarshaller());
+            assertTrue("Request unmarshalling failed, but error response was not sent.", binaryMarshaller());
         }
         catch (Exception e) {
-            assertFalse("Unexpected exception: " + e, portableMarshaller());
+            assertFalse("Unexpected exception: " + e, binaryMarshaller());
         }
     }
 
     /**
-     * @return {@code True} if portable marshaller is configured.
+     * @return {@code True} if binary marshaller is configured.
      */
-    private boolean portableMarshaller() {
+    private boolean binaryMarshaller() {
         IgniteEx kernal = (IgniteEx)ignite(0);
 
         return !OptimizedMarshaller.class.getSimpleName().equals(kernal.context().config().getMarshaller().getClass()
             .getSimpleName());
     }
-}
\ No newline at end of file
+}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index daf9c45c22cf0..786b5b86094f2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -51,7 +51,7 @@
 import org.apache.ignite.testframework.config.GridTestProperties;
 
 /**
- * Cache query suite with portable marshaller.
+ * Cache query suite with binary marshaller.
  */
 public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
     /**
@@ -61,7 +61,7 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
     public static TestSuite suite() throws Exception {
         GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName());
 
-        TestSuite suite = new TestSuite("Grid Cache Query Test Suite using PortableMarshaller");
+        TestSuite suite = new TestSuite("Grid Cache Query Test Suite using BinaryMarshaller");
 
         // Parsing
         suite.addTestSuite(GridQueryParsingTest.class);
@@ -92,8 +92,8 @@ public static TestSuite suite() throws Exception {
 
         suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
 
-        //Should be adjusted. Not ready to be used with PortableMarshaller.
-        //suite.addTestSuite(GridCachePortableSwapScanQuerySelfTest.class);
+        //Should be adjusted. Not ready to be used with BinaryMarshaller.
+        //suite.addTestSuite(GridCacheBinarySwapScanQuerySelfTest.class);
 
         suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 0f2d363be87df..486fc0d5552b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -846,10 +846,10 @@
                                         dev-tools/.gradle/**/*
                                         dev-tools/gradle/wrapper/**/*
                                         dev-tools/gradlew
-                                        src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
-                                        src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
-                                        src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
-                                        src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
+                                        src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
+                                        src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
+                                        src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
+                                        src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
                                         
                                         ipc/shmem/**/Makefile.in
                                         ipc/shmem/**/Makefile
@@ -875,8 +875,8 @@
                                         
                                         src/main/java/META-INF/services/org.apache.ignite.internal.processors.platform.PlatformBootstrapFactory
                                         src/main/resources/META-INF/services/org.apache.ignite.internal.processors.platform.PlatformBootstrapFactory
-                                        src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.jar
-                                        src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar
+                                        src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
+                                        src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
                                         **/META-INF/services/*.PlatformBootstrapFactory
                                         **/Makefile.am
                                         **/configure.ac