diff --git a/libs/main/console/pikbdlistener.h b/libs/main/console/pikbdlistener.h
index b266d11e..0488be55 100644
--- a/libs/main/console/pikbdlistener.h
+++ b/libs/main/console/pikbdlistener.h
@@ -247,11 +247,11 @@ private:
 };
 
 
-BINARY_STREAM_STORE(PIKbdListener::MouseEvent) {s << v.x << v.y << v.action << v.buttons << v.modifiers; return s;}
-BINARY_STREAM_RESTORE(PIKbdListener::MouseEvent) {s >> v.x >> v.y >> v.action >> v.buttons >> v.modifiers; return s;}
+BINARY_STREAM_WRITE(PIKbdListener::MouseEvent) {s << v.x << v.y << v.action << v.buttons << v.modifiers; return s;}
+BINARY_STREAM_READ (PIKbdListener::MouseEvent) {s >> v.x >> v.y >> v.action >> v.buttons >> v.modifiers; return s;}
 
-BINARY_STREAM_STORE(PIKbdListener::WheelEvent) {s << (*(PIKbdListener::MouseEvent*)&v) << v.direction; return s;}
-BINARY_STREAM_RESTORE(PIKbdListener::WheelEvent) {s >> (*(PIKbdListener::MouseEvent*)&v) >> v.direction; return s;}
+BINARY_STREAM_WRITE(PIKbdListener::WheelEvent) {s << (*(PIKbdListener::MouseEvent*)&v) << v.direction; return s;}
+BINARY_STREAM_READ (PIKbdListener::WheelEvent) {s >> (*(PIKbdListener::MouseEvent*)&v) >> v.direction; return s;}
 
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::KeyEvent)
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::MouseEvent)
diff --git a/libs/main/console/piscreentypes.h b/libs/main/console/piscreentypes.h
index 5f33b4f5..328ea87f 100644
--- a/libs/main/console/piscreentypes.h
+++ b/libs/main/console/piscreentypes.h
@@ -146,11 +146,11 @@ namespace PIScreenTypes {
 //inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.format.raw_format << v.symbol; return s;}
 //inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.format.raw_format >> v.symbol; return s;}
 
-BINARY_STREAM_STORE  (PIScreenTypes::Cell) {s << v.format.raw_format << v.symbol; return s;}
-BINARY_STREAM_RESTORE(PIScreenTypes::Cell) {s >> v.format.raw_format >> v.symbol; return s;}
+BINARY_STREAM_WRITE(PIScreenTypes::Cell) {s << v.format.raw_format << v.symbol; return s;}
+BINARY_STREAM_READ (PIScreenTypes::Cell) {s >> v.format.raw_format >> v.symbol; return s;}
 
-BINARY_STREAM_STORE  (PIScreenTypes::TileEvent) {s << v.type << v.data; return s;}
-BINARY_STREAM_RESTORE(PIScreenTypes::TileEvent) {s >> v.type >> v.data; return s;}
+BINARY_STREAM_WRITE(PIScreenTypes::TileEvent) {s << v.type << v.data; return s;}
+BINARY_STREAM_READ (PIScreenTypes::TileEvent) {s >> v.type >> v.data; return s;}
 
 REGISTER_PIVARIANTSIMPLE(PIScreenTypes::TileEvent)
 
diff --git a/libs/main/core/pibinarystream.h b/libs/main/core/pibinarystream.h
index 592c53f0..a545f6bc 100644
--- a/libs/main/core/pibinarystream.h
+++ b/libs/main/core/pibinarystream.h
@@ -35,9 +35,9 @@
 #define BINARY_STREAM_FRIEND(T) \
 	template<typename P> friend PIBinaryStream<P> & operator <<(PIBinaryStream<P> & s, const T & v); \
 	template<typename P> friend PIBinaryStream<P> & operator >>(PIBinaryStream<P> & s,       T & v);
-#define BINARY_STREAM_STORE(T) \
+#define BINARY_STREAM_WRITE(T) \
 	template<typename P> inline PIBinaryStream<P> & operator <<(PIBinaryStream<P> & s, const T & v)
-#define BINARY_STREAM_RESTORE(T) \
+#define BINARY_STREAM_READ(T) \
 	template<typename P> inline PIBinaryStream<P> & operator >>(PIBinaryStream<P> & s,       T & v)
 
 
diff --git a/libs/main/core/pibytearray.h b/libs/main/core/pibytearray.h
index f2221090..009f8ac0 100644
--- a/libs/main/core/pibytearray.h
+++ b/libs/main/core/pibytearray.h
@@ -219,12 +219,12 @@ inline std::ostream & operator <<(std::ostream & s, const PIByteArray & ba);
 PIP_EXPORT PICout operator <<(PICout s, const PIByteArray & ba);
 
 
-BINARY_STREAM_STORE(PIByteArray) {
+BINARY_STREAM_WRITE(PIByteArray) {
 	s.binaryStreamAppend((int)v.size_s());
 	s.binaryStreamAppend(v.data(), v.size());
 	return s;
 }
-BINARY_STREAM_RESTORE(PIByteArray) {
+BINARY_STREAM_READ(PIByteArray) {
 	v.resize(s.binaryStreamTakeInt());
 	s.binaryStreamTake(v.data(), v.size());
 	return s;
diff --git a/libs/main/core/pipropertystorage.h b/libs/main/core/pipropertystorage.h
index b1c9188c..fefb3fa3 100644
--- a/libs/main/core/pipropertystorage.h
+++ b/libs/main/core/pipropertystorage.h
@@ -271,11 +271,11 @@ protected:
 };
 
 
-BINARY_STREAM_STORE  (PIPropertyStorage::Property) {s << v.name << v.value << v.comment << v.flags; return s;}
-BINARY_STREAM_RESTORE(PIPropertyStorage::Property) {s >> v.name >> v.value >> v.comment >> v.flags; return s;}
+BINARY_STREAM_WRITE(PIPropertyStorage::Property) {s << v.name << v.value << v.comment << v.flags; return s;}
+BINARY_STREAM_READ (PIPropertyStorage::Property) {s >> v.name >> v.value >> v.comment >> v.flags; return s;}
 
-BINARY_STREAM_STORE  (PIPropertyStorage) {s << v.properties(); return s;}
-BINARY_STREAM_RESTORE(PIPropertyStorage) {s >> v.properties(); return s;}
+BINARY_STREAM_WRITE(PIPropertyStorage) {s << v.properties(); return s;}
+BINARY_STREAM_READ (PIPropertyStorage) {s >> v.properties(); return s;}
 
 
 #endif // PIPROPERTYSTORAGE_H
diff --git a/libs/main/core/pistring.h b/libs/main/core/pistring.h
index 9b965845..d282089e 100644
--- a/libs/main/core/pistring.h
+++ b/libs/main/core/pistring.h
@@ -1582,12 +1582,12 @@ PIP_EXPORT PICout operator <<(PICout s, const PIString & v);
 //! \relatesalso PIByteArray
 //! \~english Store operator.
 //! \~russian Оператор сохранения.
-BINARY_STREAM_STORE(PIString) {s << v.d; return s;}
+BINARY_STREAM_WRITE(PIString) {s << v.d; return s;}
 
 //! \relatesalso PIByteArray
 //! \~english Restore operator.
 //! \~russian Оператор извлечения.
-BINARY_STREAM_RESTORE(PIString) {v.d.clear(); s >> v.d; return s;}
+BINARY_STREAM_READ(PIString) {v.d.clear(); s >> v.d; return s;}
 
 
 //! \~english Returns concatenated string.
diff --git a/libs/main/core/pistringlist.h b/libs/main/core/pistringlist.h
index b8ed7211..66d4a047 100644
--- a/libs/main/core/pistringlist.h
+++ b/libs/main/core/pistringlist.h
@@ -126,13 +126,13 @@ public:
 };
 
 
-BINARY_STREAM_STORE(PIStringList) {
+BINARY_STREAM_WRITE(PIStringList) {
 	s.binaryStreamAppend(v.size());
 	for (int i = 0; i < v.size_s(); ++i)
 		s << v[i];
 	return s;
 }
-BINARY_STREAM_RESTORE(PIStringList) {
+BINARY_STREAM_READ(PIStringList) {
 	v.resize(s.binaryStreamTakeInt());
 	for (int i = 0; i < v.size_s(); ++i)
 		s >> v[i];
diff --git a/libs/main/core/pivariant.h b/libs/main/core/pivariant.h
index 123fb3f6..5a33a0c1 100644
--- a/libs/main/core/pivariant.h
+++ b/libs/main/core/pivariant.h
@@ -773,7 +773,7 @@ REGISTER_VARIANT(PIMathVectord)
 REGISTER_VARIANT(PIMathMatrixd)
 
 
-BINARY_STREAM_STORE(PIVariant) {
+BINARY_STREAM_WRITE(PIVariant) {
 	s << v._content << v._type;
 	if (v._type == PIVariant::pivCustom) {
 #ifdef CUSTOM_PIVARIANT
@@ -788,7 +788,7 @@ BINARY_STREAM_STORE(PIVariant) {
 	}
 	return s;
 }
-BINARY_STREAM_RESTORE(PIVariant) {
+BINARY_STREAM_READ(PIVariant) {
 	s >> v._content >> v._type;
 	if (v._type == PIVariant::pivCustom) {
 		PIString tn;
diff --git a/libs/main/core/pivarianttypes.h b/libs/main/core/pivarianttypes.h
index 74a723f4..17b0546b 100644
--- a/libs/main/core/pivarianttypes.h
+++ b/libs/main/core/pivarianttypes.h
@@ -176,22 +176,22 @@ inline PICout operator <<(PICout s, const PIVariantTypes::Color & v) {s.saveCont
 
 inline PICout operator <<(PICout s, const PIVariantTypes::IODevice & v) {s << v.toPICout(); return s;}
 
-BINARY_STREAM_STORE  (PIVariantTypes::Enumerator) {s << v.value << v.name; return s;}
-BINARY_STREAM_RESTORE(PIVariantTypes::Enumerator) {s >> v.value >> v.name; return s;}
+BINARY_STREAM_WRITE(PIVariantTypes::Enumerator) {s << v.value << v.name; return s;}
+BINARY_STREAM_READ (PIVariantTypes::Enumerator) {s >> v.value >> v.name; return s;}
 
-BINARY_STREAM_STORE  (PIVariantTypes::Enum) {s << v.enum_name << v.selected << v.enum_list; return s;}
-BINARY_STREAM_RESTORE(PIVariantTypes::Enum) {s >> v.enum_name >> v.selected >> v.enum_list; return s;}
+BINARY_STREAM_WRITE(PIVariantTypes::Enum) {s << v.enum_name << v.selected << v.enum_list; return s;}
+BINARY_STREAM_READ (PIVariantTypes::Enum) {s >> v.enum_name >> v.selected >> v.enum_list; return s;}
 
-BINARY_STREAM_STORE  (PIVariantTypes::File) {s << v.file << v.filter << uchar((v.is_abs ? 1 : 0) + (v.is_save ? 2 : 0)); return s;}
-BINARY_STREAM_RESTORE(PIVariantTypes::File) {uchar f(0); s >> v.file >> v.filter >> f; v.is_abs = ((f & 1) == 1); v.is_save = ((f & 2) == 2); return s;}
+BINARY_STREAM_WRITE(PIVariantTypes::File) {s << v.file << v.filter << uchar((v.is_abs ? 1 : 0) + (v.is_save ? 2 : 0)); return s;}
+BINARY_STREAM_READ (PIVariantTypes::File) {uchar f(0); s >> v.file >> v.filter >> f; v.is_abs = ((f & 1) == 1); v.is_save = ((f & 2) == 2); return s;}
 
-BINARY_STREAM_STORE  (PIVariantTypes::Dir) {s << v.dir << v.is_abs; return s;}
-BINARY_STREAM_RESTORE(PIVariantTypes::Dir) {s >> v.dir >> v.is_abs; return s;}
+BINARY_STREAM_WRITE(PIVariantTypes::Dir) {s << v.dir << v.is_abs; return s;}
+BINARY_STREAM_READ (PIVariantTypes::Dir) {s >> v.dir >> v.is_abs; return s;}
 
-BINARY_STREAM_STORE  (PIVariantTypes::Color) {s << v.rgba; return s;}
-BINARY_STREAM_RESTORE(PIVariantTypes::Color) {s >> v.rgba; return s;}
+BINARY_STREAM_WRITE(PIVariantTypes::Color) {s << v.rgba; return s;}
+BINARY_STREAM_READ (PIVariantTypes::Color) {s >> v.rgba; return s;}
 
-BINARY_STREAM_STORE  (PIVariantTypes::IODevice) {s << v.prefix << v.mode << v.options << v.props; return s;}
-BINARY_STREAM_RESTORE(PIVariantTypes::IODevice) {s >> v.prefix >> v.mode >> v.options >> v.props; return s;}
+BINARY_STREAM_WRITE(PIVariantTypes::IODevice) {s << v.prefix << v.mode << v.options << v.props; return s;}
+BINARY_STREAM_READ (PIVariantTypes::IODevice) {s >> v.prefix >> v.mode >> v.options >> v.props; return s;}
 
 #endif // PIVARIANTYPES_H
diff --git a/libs/main/introspection/piintrospection_containers_p.h b/libs/main/introspection/piintrospection_containers_p.h
index 14bdc349..9488b93d 100644
--- a/libs/main/introspection/piintrospection_containers_p.h
+++ b/libs/main/introspection/piintrospection_containers_p.h
@@ -66,11 +66,11 @@ public:
 };
 
 
-BINARY_STREAM_STORE  (PIIntrospectionContainers::TypeInfo) {
+BINARY_STREAM_WRITE(PIIntrospectionContainers::TypeInfo) {
 	s << PIByteArray::RawData(&v, sizeof(PIIntrospectionContainers::_Type)) << v.name;
 	return s;
 }
-BINARY_STREAM_RESTORE(PIIntrospectionContainers::TypeInfo) {
+BINARY_STREAM_READ(PIIntrospectionContainers::TypeInfo) {
 	s >> PIByteArray::RawData(&v, sizeof(PIIntrospectionContainers::_Type)) >> v.name;
 	return s;
 }
diff --git a/libs/main/introspection/piintrospection_server_p.h b/libs/main/introspection/piintrospection_server_p.h
index a5e503f8..8935ac0d 100644
--- a/libs/main/introspection/piintrospection_server_p.h
+++ b/libs/main/introspection/piintrospection_server_p.h
@@ -93,13 +93,13 @@ public:
 };
 
 
-BINARY_STREAM_STORE  (PIIntrospection::RequiredInfo) {
+BINARY_STREAM_WRITE(PIIntrospection::RequiredInfo) {
 	PIChunkStream cs;
 	cs.add(1, v.types);
 	s << cs.data();
 	return s;
 }
-BINARY_STREAM_RESTORE(PIIntrospection::RequiredInfo) {
+BINARY_STREAM_READ(PIIntrospection::RequiredInfo) {
 	PIByteArray csba; s >> csba;
 	PIChunkStream cs(csba);
 	while (!cs.atEnd()) {
@@ -111,14 +111,14 @@ BINARY_STREAM_RESTORE(PIIntrospection::RequiredInfo) {
 	return s;
 }
 
-BINARY_STREAM_STORE  (PIIntrospection::ProcessInfo) {
+BINARY_STREAM_WRITE(PIIntrospection::ProcessInfo) {
 	PIChunkStream cs;
 	cs.add(1, v.architecture).add(2, v.execCommand).add(3, v.execDateTime).add(4, v.hostname).add(5, v.OS_name)
 	  .add(6, v.OS_version).add(7, v.processorsCount).add(8, v.user).add(9, v.build_options);
 	s << cs.data();
 	return s;
 }
-BINARY_STREAM_RESTORE(PIIntrospection::ProcessInfo) {
+BINARY_STREAM_READ(PIIntrospection::ProcessInfo) {
 	PIByteArray csba; s >> csba;
 	PIChunkStream cs(csba);
 	while (!cs.atEnd()) {
@@ -138,13 +138,13 @@ BINARY_STREAM_RESTORE(PIIntrospection::ProcessInfo) {
 	return s;
 }
 
-BINARY_STREAM_STORE  (PIIntrospection::ObjectInfo) {
+BINARY_STREAM_WRITE(PIIntrospection::ObjectInfo) {
 	PIChunkStream cs;
 	cs.add(1, v.classname).add(2, v.name).add(3, v.parents).add(4, v.properties).add(5, v.queued_events);
 	s << cs.data();
 	return s;
 }
-BINARY_STREAM_RESTORE(PIIntrospection::ObjectInfo) {
+BINARY_STREAM_READ(PIIntrospection::ObjectInfo) {
 	PIByteArray csba; s >> csba;
 	PIChunkStream cs(csba);
 	while (!cs.atEnd()) {
diff --git a/libs/main/introspection/piintrospection_threads_p.h b/libs/main/introspection/piintrospection_threads_p.h
index df507fa3..42ab27e2 100644
--- a/libs/main/introspection/piintrospection_threads_p.h
+++ b/libs/main/introspection/piintrospection_threads_p.h
@@ -58,11 +58,11 @@ public:
 };
 
 
-BINARY_STREAM_STORE(PIIntrospectionThreads::ThreadInfo) {
+BINARY_STREAM_WRITE(PIIntrospectionThreads::ThreadInfo) {
 	s << v.classname << v.name << v.id << v.state << v.priority << v.delay << v.run_us << v.run_count;
 	return s;
 }
-BINARY_STREAM_RESTORE(PIIntrospectionThreads::ThreadInfo) {
+BINARY_STREAM_READ(PIIntrospectionThreads::ThreadInfo) {
 	s >> v.classname >> v.name >> v.id >> v.state >> v.priority >> v.delay >> v.run_us >> v.run_count;
 	return s;
 }
diff --git a/libs/main/io_devices/pifile.h b/libs/main/io_devices/pifile.h
index ee539635..95fb7317 100644
--- a/libs/main/io_devices/pifile.h
+++ b/libs/main/io_devices/pifile.h
@@ -518,7 +518,7 @@ inline PICout operator <<(PICout s, const PIFile::FileInfo & v) {
 //! \relatesalso PIByteArray
 //! \~english Store operator
 //! \~russian Оператор сохранения
-BINARY_STREAM_STORE  (PIFile::FileInfo) {
+BINARY_STREAM_WRITE(PIFile::FileInfo) {
 	s << v.path << v.size << v.time_access << v.time_modification <<
 	 v.flags << v.id_user << v.id_group << v.perm_user.raw << v.perm_group.raw << v.perm_other.raw;
 	return s;
@@ -527,7 +527,7 @@ BINARY_STREAM_STORE  (PIFile::FileInfo) {
 //! \relatesalso PIByteArray
 //! \~english Restore operator
 //! \~russian Оператор извлечения
-BINARY_STREAM_RESTORE(PIFile::FileInfo) {
+BINARY_STREAM_READ(PIFile::FileInfo) {
 	s >> v.path >> v.size >> v.time_access >> v.time_modification >>
 	v.flags >> v.id_user >> v.id_group >> v.perm_user.raw >> v.perm_group.raw >> v.perm_other.raw;
 	return s;
diff --git a/libs/main/io_devices/pipeer.h b/libs/main/io_devices/pipeer.h
index 5565606c..0a2ddf93 100644
--- a/libs/main/io_devices/pipeer.h
+++ b/libs/main/io_devices/pipeer.h
@@ -207,10 +207,10 @@ private:
 inline PICout operator <<(PICout c, const PIPeer::PeerInfo::PeerAddress & v) {c.space(); c << "PeerAddress(" << v.address << ", " << v.netmask << ", " << v.ping << ")"; return c;}
 inline PICout operator <<(PICout c, const PIPeer::PeerInfo & v) {c.space(); c << "PeerInfo(" << v.name << ", " << v.dist << ", " << v.addresses << ")"; return c;}
 
-BINARY_STREAM_STORE  (PIPeer::PeerInfo::PeerAddress) {s << v.address << v.netmask << v.ping; return s;}
-BINARY_STREAM_RESTORE(PIPeer::PeerInfo::PeerAddress) {s >> v.address >> v.netmask >> v.ping; return s;}
+BINARY_STREAM_WRITE(PIPeer::PeerInfo::PeerAddress) {s << v.address << v.netmask << v.ping; return s;}
+BINARY_STREAM_READ (PIPeer::PeerInfo::PeerAddress) {s >> v.address >> v.netmask >> v.ping; return s;}
 
-BINARY_STREAM_STORE  (PIPeer::PeerInfo) {s << v.name << v.addresses << v.dist << v.neighbours << v.cnt << v.time; return s;}
-BINARY_STREAM_RESTORE(PIPeer::PeerInfo) {s >> v.name >> v.addresses >> v.dist >> v.neighbours >> v.cnt >> v.time; return s;}
+BINARY_STREAM_WRITE(PIPeer::PeerInfo) {s << v.name << v.addresses << v.dist << v.neighbours << v.cnt << v.time; return s;}
+BINARY_STREAM_READ (PIPeer::PeerInfo) {s >> v.name >> v.addresses >> v.dist >> v.neighbours >> v.cnt >> v.time; return s;}
 
 #endif // PIPEER_H
diff --git a/libs/main/io_utils/pibasetransfer.h b/libs/main/io_utils/pibasetransfer.h
index 3f945e3f..3ae90311 100644
--- a/libs/main/io_utils/pibasetransfer.h
+++ b/libs/main/io_utils/pibasetransfer.h
@@ -144,14 +144,14 @@ private:
 	PIString pm_string;
 };
 
-BINARY_STREAM_STORE  (PIBaseTransfer::PacketHeader) {s << v.sig << v.type << v.session_id << v.id << v.crc; return s;}
-BINARY_STREAM_RESTORE(PIBaseTransfer::PacketHeader) {s >> v.sig >> v.type >> v.session_id >> v.id >> v.crc; return s;}
+BINARY_STREAM_WRITE(PIBaseTransfer::PacketHeader) {s << v.sig << v.type << v.session_id << v.id << v.crc; return s;}
+BINARY_STREAM_READ (PIBaseTransfer::PacketHeader) {s >> v.sig >> v.type >> v.session_id >> v.id >> v.crc; return s;}
 
-BINARY_STREAM_STORE  (PIBaseTransfer::Part) {s << v.id << v.size << v.start; return s;}
-BINARY_STREAM_RESTORE(PIBaseTransfer::Part) {s >> v.id >> v.size >> v.start; return s;}
+BINARY_STREAM_WRITE(PIBaseTransfer::Part) {s << v.id << v.size << v.start; return s;}
+BINARY_STREAM_READ (PIBaseTransfer::Part) {s >> v.id >> v.size >> v.start; return s;}
 
-BINARY_STREAM_STORE  (PIBaseTransfer::StartRequest) {s << v.packets << v.size; return s;}
-BINARY_STREAM_RESTORE(PIBaseTransfer::StartRequest) {s >> v.packets >> v.size; return s;}
+BINARY_STREAM_WRITE(PIBaseTransfer::StartRequest) {s << v.packets << v.size; return s;}
+BINARY_STREAM_READ (PIBaseTransfer::StartRequest) {s >> v.packets >> v.size; return s;}
 
 inline PICout operator <<(PICout s, const PIBaseTransfer::Part & v) {s.setControl(0, true); s << "Part(\"" << v.id  << "\", " << PIString::readableSize(v.start) << " b | " << PIString::readableSize(v.size) << " b)"; s.restoreControl(); return s;}
 
diff --git a/libs/main/io_utils/pifiletransfer.h b/libs/main/io_utils/pifiletransfer.h
index 4083dda7..93981c76 100644
--- a/libs/main/io_utils/pifiletransfer.h
+++ b/libs/main/io_utils/pifiletransfer.h
@@ -111,15 +111,15 @@ private:
 	EVENT_HANDLER1(void, receive_finished, bool, ok);
 };
 
-BINARY_STREAM_STORE  (PIFileTransfer::PFTHeader) {s << v.raw_sig << v.step << v.session_id; return s;}
-BINARY_STREAM_RESTORE(PIFileTransfer::PFTHeader) {s >> v.raw_sig >> v.step >> v.session_id; return s;}
+BINARY_STREAM_WRITE(PIFileTransfer::PFTHeader) {s << v.raw_sig << v.step << v.session_id; return s;}
+BINARY_STREAM_READ (PIFileTransfer::PFTHeader) {s >> v.raw_sig >> v.step >> v.session_id; return s;}
 
-BINARY_STREAM_STORE  (PIFileTransfer::PFTFileInfo) {
+BINARY_STREAM_WRITE(PIFileTransfer::PFTFileInfo) {
 	s << v.dest_path << v.size << v.time_access << v.time_modification <<
 	v.flags << v.id_user << v.id_group << v.perm_user.raw << v.perm_group.raw << v.perm_other.raw;
 	return s;
 }
-BINARY_STREAM_RESTORE(PIFileTransfer::PFTFileInfo) {
+BINARY_STREAM_READ (PIFileTransfer::PFTFileInfo) {
 	s >> v.dest_path >> v.size >> v.time_access >> v.time_modification >>
 	v.flags >> v.id_user >> v.id_group >> v.perm_user.raw >> v.perm_group.raw >> v.perm_other.raw;
 	return s;
diff --git a/libs/main/math/pievaluator.h b/libs/main/math/pievaluator.h
index 05af3cad..f83ba741 100644
--- a/libs/main/math/pievaluator.h
+++ b/libs/main/math/pievaluator.h
@@ -228,16 +228,16 @@ private:
 inline bool operator ==(PIEvaluatorTypes::Element e1, PIEvaluatorTypes::Element e2) {return (e1.type == e2.type && e1.num == e2.num);}
 inline bool operator !=(PIEvaluatorTypes::Element e1, PIEvaluatorTypes::Element e2) {return (e1.type != e2.type || e1.num != e2.num);}
 
-BINARY_STREAM_STORE  (PIEvaluatorTypes::Instruction) {s << PIByteArray::RawData(&v, sizeof(v) - sizeof(v.operators)) << v.operators; return s;}
-BINARY_STREAM_RESTORE(PIEvaluatorTypes::Instruction) {s >> PIByteArray::RawData(&v, sizeof(v) - sizeof(v.operators)) >> v.operators; return s;}
+BINARY_STREAM_WRITE(PIEvaluatorTypes::Instruction) {s << PIByteArray::RawData(&v, sizeof(v) - sizeof(v.operators)) << v.operators; return s;}
+BINARY_STREAM_READ (PIEvaluatorTypes::Instruction) {s >> PIByteArray::RawData(&v, sizeof(v) - sizeof(v.operators)) >> v.operators; return s;}
 
-BINARY_STREAM_STORE  (PIEvaluatorTypes::Element) {s << PIByteArray::RawData(&v, sizeof(v)); return s;}
-BINARY_STREAM_RESTORE(PIEvaluatorTypes::Element) {s >> PIByteArray::RawData(&v, sizeof(v)); return s;}
+BINARY_STREAM_WRITE(PIEvaluatorTypes::Element) {s << PIByteArray::RawData(&v, sizeof(v)); return s;}
+BINARY_STREAM_READ (PIEvaluatorTypes::Element) {s >> PIByteArray::RawData(&v, sizeof(v)); return s;}
 
-BINARY_STREAM_STORE  (PIEvaluatorTypes::Variable) {s << v.name << v.value; return s;}
-BINARY_STREAM_RESTORE(PIEvaluatorTypes::Variable) {s >> v.name >> v.value; return s;}
+BINARY_STREAM_WRITE(PIEvaluatorTypes::Variable) {s << v.name << v.value; return s;}
+BINARY_STREAM_READ (PIEvaluatorTypes::Variable) {s >> v.name >> v.value; return s;}
 
-BINARY_STREAM_STORE  (PIEvaluatorContent) {s << v.variables << v.cv_count; return s;}
-BINARY_STREAM_RESTORE(PIEvaluatorContent) {s >> v.variables >> v.cv_count; return s;}
+BINARY_STREAM_WRITE(PIEvaluatorContent) {s << v.variables << v.cv_count; return s;}
+BINARY_STREAM_READ (PIEvaluatorContent) {s >> v.variables >> v.cv_count; return s;}
 
 #endif // PIEVALUATOR_H
diff --git a/libs/main/resources/piresourcesstorage.h b/libs/main/resources/piresourcesstorage.h
index 8e9bae13..26f0b872 100644
--- a/libs/main/resources/piresourcesstorage.h
+++ b/libs/main/resources/piresourcesstorage.h
@@ -76,14 +76,14 @@ private:
 };
 
 
-BINARY_STREAM_STORE  (PIResourcesStorage::__RCEntry) {
+BINARY_STREAM_WRITE(PIResourcesStorage::__RCEntry) {
 	PIChunkStream cs;
 	cs.add(1, v.section).add(2, v.name).add(3, v.file).add(4, v.size)
 	  .add(5, v.offset).add(6, v.flags).add(7, v.alias);
 	s << cs.data();
 	return s;
 }
-BINARY_STREAM_RESTORE(PIResourcesStorage::__RCEntry) {
+BINARY_STREAM_READ (PIResourcesStorage::__RCEntry) {
 	PIByteArray ba; s >> ba;
 	PIChunkStream cs(ba);
 	while (!cs.atEnd()) {
diff --git a/libs/main/system/pisystemmonitor.h b/libs/main/system/pisystemmonitor.h
index 1b604ed0..bcc92a8a 100644
--- a/libs/main/system/pisystemmonitor.h
+++ b/libs/main/system/pisystemmonitor.h
@@ -293,7 +293,7 @@ inline PICout operator <<(PICout s, const PISystemMonitor::ThreadStats & v) {
 
 //! \~english Store operator
 //! \~russian Оператор сохранения
-BINARY_STREAM_STORE  (PISystemMonitor::ProcessStats) {
+BINARY_STREAM_WRITE(PISystemMonitor::ProcessStats) {
 	s << PIByteArray::RawData(&v, sizeof(PISystemMonitor::ProcessStatsFixed))
 	  << v.exec_name << v.state;
 	return s;
@@ -301,7 +301,7 @@ BINARY_STREAM_STORE  (PISystemMonitor::ProcessStats) {
 
 //! \~english Restore operator
 //! \~russian Оператор извлечения
-BINARY_STREAM_RESTORE(PISystemMonitor::ProcessStats) {
+BINARY_STREAM_READ (PISystemMonitor::ProcessStats) {
 	s >> PIByteArray::RawData(&v, sizeof(PISystemMonitor::ProcessStatsFixed))
 	  >> v.exec_name >> v.state;
 	v.makeStrings();
@@ -310,7 +310,7 @@ BINARY_STREAM_RESTORE(PISystemMonitor::ProcessStats) {
 
 //! \~english Store operator
 //! \~russian Оператор сохранения
-BINARY_STREAM_STORE  (PISystemMonitor::ThreadStats) {
+BINARY_STREAM_WRITE(PISystemMonitor::ThreadStats) {
 	s << PIByteArray::RawData(&v, sizeof(PISystemMonitor::ThreadStatsFixed))
 	  << v.name;
 	return s;
@@ -318,7 +318,7 @@ BINARY_STREAM_STORE  (PISystemMonitor::ThreadStats) {
 
 //! \~english Restore operator
 //! \~russian Оператор извлечения
-BINARY_STREAM_RESTORE(PISystemMonitor::ThreadStats) {
+BINARY_STREAM_READ (PISystemMonitor::ThreadStats) {
 	s >> PIByteArray::RawData(&v, sizeof(PISystemMonitor::ThreadStatsFixed))
 	  >> v.name;
 	return s;
diff --git a/utils/system_daemon/daemon.h b/utils/system_daemon/daemon.h
index 665b29c5..e469900c 100644
--- a/utils/system_daemon/daemon.h
+++ b/utils/system_daemon/daemon.h
@@ -195,7 +195,7 @@ private:
 	int offset, cur, height;
 };
 
-BINARY_STREAM_STORE  (Daemon::HostInfo) {
+BINARY_STREAM_WRITE(Daemon::HostInfo) {
 	s << v.execCommand << v.hostname << v.user << v.OS_name
 		<< v.OS_version << v.architecture << v.execDateTime
 		<< v.processorsCount << v.ID << v.threads << v.priority
@@ -203,7 +203,7 @@ BINARY_STREAM_STORE  (Daemon::HostInfo) {
 		<< v.cpu_load_system << v.cpu_load_user;
 	return s;
 }
-BINARY_STREAM_RESTORE(Daemon::HostInfo) {
+BINARY_STREAM_READ (Daemon::HostInfo) {
 	s >> v.execCommand >> v.hostname >> v.user >> v.OS_name
 		>> v.OS_version >> v.architecture >> v.execDateTime
 		>> v.processorsCount >> v.ID >> v.threads >> v.priority