diff --git a/libs/http_server/microhttpd_server_p.cpp b/libs/http_server/microhttpd_server_p.cpp
index 34dda5a7..ee1fdb07 100644
--- a/libs/http_server/microhttpd_server_p.cpp
+++ b/libs/http_server/microhttpd_server_p.cpp
@@ -32,7 +32,7 @@
 
 using namespace PIHTTP;
 
-__PIP_TYPENAME_DECLARE(MHD_OptionItem)
+PIP_REGISTER_TYPENAME(MHD_OptionItem)
 
 
 struct BasicAuthCred {
diff --git a/libs/http_server/pihttpserver.cpp b/libs/http_server/pihttpserver.cpp
index ec6639e4..bec82e71 100644
--- a/libs/http_server/pihttpserver.cpp
+++ b/libs/http_server/pihttpserver.cpp
@@ -8,7 +8,7 @@ struct Endpoint: public PIHTTP::ServerEndpoint {
 	PIHTTPServer::RequestFunction function;
 };
 
-__PIP_TYPENAME_DECLARE(Endpoint)
+PIP_REGISTER_TYPENAME(Endpoint)
 
 
 PRIVATE_DEFINITION_START(PIHTTPServer)
diff --git a/libs/main/application/picli.h b/libs/main/application/picli.h
index f7f62c7b..211a821f 100644
--- a/libs/main/application/picli.h
+++ b/libs/main/application/picli.h
@@ -159,7 +159,7 @@ public:
 
 private:
 	struct Argument {
-		static const char * __pip_typename__() { return "PICLI::Argument"; }
+		PIP_DECLARE_TYPENAME("PICLI::Argument")
 		Argument() {}
 		Argument(const PIString & n, const PIChar & s, const PIString & f, bool v) {
 			name      = n;
diff --git a/libs/main/application/pilog.h b/libs/main/application/pilog.h
index a00e8088..214842ed 100644
--- a/libs/main/application/pilog.h
+++ b/libs/main/application/pilog.h
@@ -164,7 +164,7 @@ private:
 	void enqueue(const PIString & msg, Level cat = Level::Debug);
 
 	struct Entry {
-		static const char * __pip_typename__() { return "PILog::Entry"; }
+		PIP_DECLARE_TYPENAME("PILog::Entry")
 		Level cat;
 		PIDateTime time;
 		PIString msg;
@@ -188,7 +188,7 @@ private:
 	int part_number = -1, cout_id = -1;
 };
 
-__PIP_TYPENAME_DECLARE(PILog::Level)
+PIP_REGISTER_TYPENAME(PILog::Level)
 
 #  endif // PIP_HAS_FILESYSTEM
 #endif   // PIP_HAS_THREADS
diff --git a/libs/main/application/pisystemmonitor.h b/libs/main/application/pisystemmonitor.h
index 61802adf..4650a563 100644
--- a/libs/main/application/pisystemmonitor.h
+++ b/libs/main/application/pisystemmonitor.h
@@ -336,8 +336,8 @@ BINARY_STREAM_READ(PISystemMonitor::ThreadStats) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PISystemMonitor *)
-__PIP_TYPENAME_DECLARE(PISystemMonitor::ThreadStats)
+PIP_REGISTER_TYPENAME(PISystemMonitor *)
+PIP_REGISTER_TYPENAME(PISystemMonitor::ThreadStats)
 
 #endif // PIP_HAS_THREADS
 
diff --git a/libs/main/application/pitranslator_p.h b/libs/main/application/pitranslator_p.h
index 9ddf9d65..3002e66f 100644
--- a/libs/main/application/pitranslator_p.h
+++ b/libs/main/application/pitranslator_p.h
@@ -50,6 +50,6 @@ PIP_EXPORT void writeHeader(PIIODevice * d);
 
 } // namespace PITranslatorPrivate
 
-__PIP_TYPENAME_DECLARE(PITranslatorPrivate::Context *)
+PIP_REGISTER_TYPENAME(PITranslatorPrivate::Context *)
 
 #endif
diff --git a/libs/main/client_server/piclientserver_client.h b/libs/main/client_server/piclientserver_client.h
index 2f2c013c..e0b0e323 100644
--- a/libs/main/client_server/piclientserver_client.h
+++ b/libs/main/client_server/piclientserver_client.h
@@ -93,7 +93,7 @@ private:
 
 } // namespace PIClientServer
 
-__PIP_TYPENAME_DECLARE(PIClientServer::ServerClient *)
+PIP_REGISTER_TYPENAME(PIClientServer::ServerClient *)
 
 
 #endif
diff --git a/libs/main/cloud/picloudserver.h b/libs/main/cloud/picloudserver.h
index 9b4cd72f..c6e4d79b 100644
--- a/libs/main/cloud/picloudserver.h
+++ b/libs/main/cloud/picloudserver.h
@@ -129,7 +129,7 @@ private:
 	std::atomic_bool is_deleted;
 };
 
-__PIP_TYPENAME_DECLARE(PICloudServer::Client *)
+PIP_REGISTER_TYPENAME(PICloudServer::Client *)
 
 #endif // PIP_HAS_SOCKET && PIP_HAS_THREADS
 
diff --git a/libs/main/cloud/picloudtcp.h b/libs/main/cloud/picloudtcp.h
index 7b1dce47..d965d27d 100644
--- a/libs/main/cloud/picloudtcp.h
+++ b/libs/main/cloud/picloudtcp.h
@@ -143,7 +143,7 @@ public:
 
 private:
 	struct Header {
-		static const char * __pip_typename__() { return "PICloud::TCP::Header"; }
+		PIP_DECLARE_TYPENAME("PICloud::TCP::Header")
 		Header();
 		uchar version; // PICloud::Version
 		uchar type;    // PICloud::Type
diff --git a/libs/main/code/picodeinfo.h b/libs/main/code/picodeinfo.h
index e28e007e..f16b9bf7 100644
--- a/libs/main/code/picodeinfo.h
+++ b/libs/main/code/picodeinfo.h
@@ -439,7 +439,7 @@ void serialize(PIByteArray & ret, const T & v) {}
 
 } // namespace PICodeInfo
 
-__PIP_TYPENAME_DECLARE(PICodeInfo::ClassInfo *)
-__PIP_TYPENAME_DECLARE(PICodeInfo::EnumInfo *)
+PIP_REGISTER_TYPENAME(PICodeInfo::ClassInfo *)
+PIP_REGISTER_TYPENAME(PICodeInfo::EnumInfo *)
 
 #endif // PICODEINFO_H
diff --git a/libs/main/code/picodeparser.h b/libs/main/code/picodeparser.h
index eda92560..ae4544c1 100644
--- a/libs/main/code/picodeparser.h
+++ b/libs/main/code/picodeparser.h
@@ -384,10 +384,10 @@ private:
 	PIMap<PIString, MetaMap> tmp_meta;
 };
 
-__PIP_TYPENAME_DECLARE(PICodeParser::Entity *)
-__PIP_TYPENAME_DECLARE(PICodeParser::Enum)
-__PIP_TYPENAME_DECLARE(PICodeParser::EnumeratorInfo)
-__PIP_TYPENAME_DECLARE(PICodeParser::Macro)
-__PIP_TYPENAME_DECLARE(PICodeParser::Member)
+PIP_REGISTER_TYPENAME(PICodeParser::Entity *)
+PIP_REGISTER_TYPENAME(PICodeParser::Enum)
+PIP_REGISTER_TYPENAME(PICodeParser::EnumeratorInfo)
+PIP_REGISTER_TYPENAME(PICodeParser::Macro)
+PIP_REGISTER_TYPENAME(PICodeParser::Member)
 
 #endif // PICODEPARSER_H
diff --git a/libs/main/console/pikbdlistener.h b/libs/main/console/pikbdlistener.h
index 57a368af..82457e24 100644
--- a/libs/main/console/pikbdlistener.h
+++ b/libs/main/console/pikbdlistener.h
@@ -381,7 +381,7 @@ REGISTER_PIVARIANTSIMPLE(PIKbdListener::KeyEvent)
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::MouseEvent)
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::WheelEvent)
 
-__PIP_TYPENAME_DECLARE(PIKbdListener::KeyEvent)
+PIP_REGISTER_TYPENAME(PIKbdListener::KeyEvent)
 
 #endif // PIP_HAS_THREADS
 #endif // PIKBDLISTENER_H
diff --git a/libs/main/console/piscreendrawer.h b/libs/main/console/piscreendrawer.h
index 794e34e7..b1ec1ad5 100644
--- a/libs/main/console/piscreendrawer.h
+++ b/libs/main/console/piscreendrawer.h
@@ -145,7 +145,7 @@ private:
 	PIMap<ArtChar, PIChar> arts_;
 };
 
-__PIP_TYPENAME_DECLARE(PIScreenDrawer::ArtChar)
+PIP_REGISTER_TYPENAME(PIScreenDrawer::ArtChar)
 
 
 #endif // PISCREENDRAWER_H
diff --git a/libs/main/console/piscreentile.h b/libs/main/console/piscreentile.h
index 9a7485d5..3d1e5a6d 100644
--- a/libs/main/console/piscreentile.h
+++ b/libs/main/console/piscreentile.h
@@ -239,7 +239,7 @@ private:
 	int pw, ph;
 };
 
-__PIP_TYPENAME_DECLARE(PIScreenTile *)
+PIP_REGISTER_TYPENAME(PIScreenTile *)
 
 #endif // PIP_HAS_THREADS
 
diff --git a/libs/main/console/piscreentiles.h b/libs/main/console/piscreentiles.h
index 7911da76..74e66328 100644
--- a/libs/main/console/piscreentiles.h
+++ b/libs/main/console/piscreentiles.h
@@ -287,7 +287,7 @@ protected:
 	bool keyEvent(PIKbdListener::KeyEvent key) override;
 	bool mouseEvent(PIKbdListener::MouseEvent me) override;
 	struct Rect {
-		static const char * __pip_typename__() { return "TileButtons::Rect"; }
+		PIP_DECLARE_TYPENAME("TileButtons::Rect")
 		Rect(int _x0 = 0, int _y0 = 0, int _x1 = 0, int _y1 = 0): x0(_x0), y0(_y0), x1(_x1), y1(_y1) {}
 		int x0, y0, x1, y1;
 	};
diff --git a/libs/main/console/piscreentypes.h b/libs/main/console/piscreentypes.h
index 6c500631..87a8250c 100644
--- a/libs/main/console/piscreentypes.h
+++ b/libs/main/console/piscreentypes.h
@@ -284,7 +284,7 @@ BINARY_STREAM_READ(PIScreenTypes::TileEvent) {
 
 REGISTER_PIVARIANTSIMPLE(PIScreenTypes::TileEvent)
 
-__PIP_TYPENAME_DECLARE(PIScreenTypes::Cell)
-__PIP_TYPENAME_DECLARE(PIScreenTypes::CellFormat)
+PIP_REGISTER_TYPENAME(PIScreenTypes::Cell)
+PIP_REGISTER_TYPENAME(PIScreenTypes::CellFormat)
 
 #endif // PISCREENTYPES_H
diff --git a/libs/main/core/pibase_macros.h b/libs/main/core/pibase_macros.h
index a44ecbb7..307dde6c 100644
--- a/libs/main/core/pibase_macros.h
+++ b/libs/main/core/pibase_macros.h
@@ -168,6 +168,12 @@
 //! \~russian Макрос для подавления предупреждения компилятора о неиспользуемой переменной
 #  define NO_UNUSED(x)
 
+//! \~english Macro to declare a type name for use with __PIP_TYPENAME__ when RTTI is disabled.
+//! Use inside a class definition.
+//! \~russian Макрос для объявления имени типа для использования с __PIP_TYPENAME__ при отключённом RTTI.
+//! Используется внутри определения класса.
+#  define PIP_DECLARE_TYPENAME(name)
+
 #endif // DOXYGEN
 
 #ifdef WINDOWS
@@ -237,7 +243,8 @@ struct __pip_typename__ {
 	static const char * get() { return typeid(T).name(); }
 };
 #	define __PIP_TYPENAME__(...) __pip_typename__<__VA_ARGS__>::get()
-#	define __PIP_TYPENAME_DECLARE(T)
+#	define PIP_REGISTER_TYPENAME(T)
+#	define PIP_DECLARE_TYPENAME(name)
 #  else
 template<typename...>
 using __pip_void_t = void;
@@ -246,7 +253,7 @@ using __pip_void_t = void;
 template<typename T, typename = void>
 struct __pip_typename__ {
 	static const char * get() {
-		static_assert(false, "register the type with __PIP_TYPENAME_DECLARE or a public static __pip_typename__() member");
+		static_assert(false, "register the type with PIP_REGISTER_TYPENAME or a public static __pip_typename__() member");
 		return "T";
 	}
 };
@@ -262,7 +269,7 @@ struct __pip_typename__<T *, __pip_void_t<decltype(T::__pip_typename__())>> {
 	static const char * get() { return T::__pip_typename__(); }
 };
 
-#	define __PIP_TYPENAME_DECLARE(T)   \
+#	define PIP_REGISTER_TYPENAME(T)    \
 		template<>                      \
 		struct __pip_typename__<T> {    \
 			static const char * get() { \
@@ -270,27 +277,32 @@ struct __pip_typename__<T *, __pip_void_t<decltype(T::__pip_typename__())>> {
 			}                           \
 		};
 
-__PIP_TYPENAME_DECLARE(bool)
-__PIP_TYPENAME_DECLARE(char)
-__PIP_TYPENAME_DECLARE(signed char)
-__PIP_TYPENAME_DECLARE(unsigned char)
-__PIP_TYPENAME_DECLARE(short)
-__PIP_TYPENAME_DECLARE(unsigned short)
-__PIP_TYPENAME_DECLARE(int)
-__PIP_TYPENAME_DECLARE(unsigned int)
-__PIP_TYPENAME_DECLARE(long)
-__PIP_TYPENAME_DECLARE(unsigned long)
-__PIP_TYPENAME_DECLARE(long long)
-__PIP_TYPENAME_DECLARE(unsigned long long)
-__PIP_TYPENAME_DECLARE(float)
-__PIP_TYPENAME_DECLARE(double)
-__PIP_TYPENAME_DECLARE(long double)
-__PIP_TYPENAME_DECLARE(void)
-__PIP_TYPENAME_DECLARE(void *)
-__PIP_TYPENAME_DECLARE(const void *)
-__PIP_TYPENAME_DECLARE(const char *)
-__PIP_TYPENAME_DECLARE(const unsigned char *)
-__PIP_TYPENAME_DECLARE(bool *)
+#	define PIP_DECLARE_TYPENAME(name)           \
+		static const char * __pip_typename__() { \
+			return name;                         \
+		}
+
+PIP_REGISTER_TYPENAME(bool)
+PIP_REGISTER_TYPENAME(char)
+PIP_REGISTER_TYPENAME(signed char)
+PIP_REGISTER_TYPENAME(unsigned char)
+PIP_REGISTER_TYPENAME(short)
+PIP_REGISTER_TYPENAME(unsigned short)
+PIP_REGISTER_TYPENAME(int)
+PIP_REGISTER_TYPENAME(unsigned int)
+PIP_REGISTER_TYPENAME(long)
+PIP_REGISTER_TYPENAME(unsigned long)
+PIP_REGISTER_TYPENAME(long long)
+PIP_REGISTER_TYPENAME(unsigned long long)
+PIP_REGISTER_TYPENAME(float)
+PIP_REGISTER_TYPENAME(double)
+PIP_REGISTER_TYPENAME(long double)
+PIP_REGISTER_TYPENAME(void)
+PIP_REGISTER_TYPENAME(void *)
+PIP_REGISTER_TYPENAME(const void *)
+PIP_REGISTER_TYPENAME(const char *)
+PIP_REGISTER_TYPENAME(const unsigned char *)
+PIP_REGISTER_TYPENAME(bool *)
 
 #	define __PIP_TYPENAME__(...) __pip_typename__<__VA_ARGS__>::get()
 #  endif
diff --git a/libs/main/core/picollection.h b/libs/main/core/picollection.h
index 868c1643..38b55e9a 100644
--- a/libs/main/core/picollection.h
+++ b/libs/main/core/picollection.h
@@ -145,7 +145,7 @@ public:
 
 protected:
 	struct PIP_EXPORT Group {
-		static const char * __pip_typename__() { return "PICollection::Group"; }
+		PIP_DECLARE_TYPENAME("PICollection::Group")
 		Group(const PIString & name_ = PIString()) { name = name_; }
 		PIString name;
 		PIVector<const PIObject *> elements;
diff --git a/libs/main/core/picout.h b/libs/main/core/picout.h
index 982a6193..1e4d2ff9 100644
--- a/libs/main/core/picout.h
+++ b/libs/main/core/picout.h
@@ -502,6 +502,6 @@ private:
 	PICoutStdStream stream_                  = PICoutStdStream::StdOut;
 };
 
-__PIP_TYPENAME_DECLARE(PICoutManipulators::PICoutControl)
+PIP_REGISTER_TYPENAME(PICoutManipulators::PICoutControl)
 
 #endif // PICOUT_H
diff --git a/libs/main/core/piobject.h b/libs/main/core/piobject.h
index 273f4b03..7a0ef334 100644
--- a/libs/main/core/piobject.h
+++ b/libs/main/core/piobject.h
@@ -781,7 +781,7 @@ protected:
 
 private:
 	struct __QueuedEvent {
-		static const char * __pip_typename__() { return "PIObject::__QueuedEvent"; }
+		PIP_DECLARE_TYPENAME("PIObject::__QueuedEvent")
 		__QueuedEvent(void * sl                           = 0,
 		              void * d                            = 0,
 		              PIObject * d_o                      = 0,
@@ -856,10 +856,10 @@ PIP_EXPORT bool dumpApplicationToFile(const PIString & path, bool with_objects =
 
 #endif // PIP_INTROSPECTION
 
-__PIP_TYPENAME_DECLARE(PIObject *)
-__PIP_TYPENAME_DECLARE(const PIObject *)
-__PIP_TYPENAME_DECLARE(PIObject::Connection)
-__PIP_TYPENAME_DECLARE(PIObject::__MetaData)
-__PIP_TYPENAME_DECLARE(PIObject::__MetaFunc)
+PIP_REGISTER_TYPENAME(PIObject *)
+PIP_REGISTER_TYPENAME(const PIObject *)
+PIP_REGISTER_TYPENAME(PIObject::Connection)
+PIP_REGISTER_TYPENAME(PIObject::__MetaData)
+PIP_REGISTER_TYPENAME(PIObject::__MetaFunc)
 
 #endif // PIOBJECT_H
diff --git a/libs/main/geo/pigeoposition.h b/libs/main/geo/pigeoposition.h
index 4fb758a2..585064b8 100644
--- a/libs/main/geo/pigeoposition.h
+++ b/libs/main/geo/pigeoposition.h
@@ -382,6 +382,6 @@ inline PIGeoPosition operator*(const PIGeoPosition & left, const int & scale) {
 }
 
 
-__PIP_TYPENAME_DECLARE(PIGeoPosition)
+PIP_REGISTER_TYPENAME(PIGeoPosition)
 
 #endif // PIGEOPOSITION_H
diff --git a/libs/main/http_client/pihttpclient.h b/libs/main/http_client/pihttpclient.h
index edf33280..8d54e61e 100644
--- a/libs/main/http_client/pihttpclient.h
+++ b/libs/main/http_client/pihttpclient.h
@@ -124,7 +124,7 @@ private:
 	std::function<void(const PIHTTP::MessageConst &)> on_finish, on_error, on_abort;
 };
 
-__PIP_TYPENAME_DECLARE(PIHTTPClient *)
+PIP_REGISTER_TYPENAME(PIHTTPClient *)
 
 
 #endif
diff --git a/libs/main/http_common/piserverendpoint_p.h b/libs/main/http_common/piserverendpoint_p.h
index 229c1696..b6844925 100644
--- a/libs/main/http_common/piserverendpoint_p.h
+++ b/libs/main/http_common/piserverendpoint_p.h
@@ -68,7 +68,7 @@ struct PIP_EXPORT ServerEndpoint {
 
 }; // namespace PIHTTP
 
-__PIP_TYPENAME_DECLARE(PIHTTP::ServerEndpoint::PathElement)
-__PIP_TYPENAME_DECLARE(PIHTTP::ServerEndpoint::PathElement::Type)
+PIP_REGISTER_TYPENAME(PIHTTP::ServerEndpoint::PathElement)
+PIP_REGISTER_TYPENAME(PIHTTP::ServerEndpoint::PathElement::Type)
 
 #endif
diff --git a/libs/main/http_server/microhttpd_server.h b/libs/main/http_server/microhttpd_server.h
index 5aafea58..3010a312 100644
--- a/libs/main/http_server/microhttpd_server.h
+++ b/libs/main/http_server/microhttpd_server.h
@@ -132,7 +132,7 @@ private:
 	PIByteArray mem_key, mem_cert, key_pass;
 };
 
-__PIP_TYPENAME_DECLARE(MicrohttpdServer::Option)
+PIP_REGISTER_TYPENAME(MicrohttpdServer::Option)
 
 
 #endif
diff --git a/libs/main/introspection/piintrospection_containers_p.h b/libs/main/introspection/piintrospection_containers_p.h
index 6cd24ae0..5807c107 100644
--- a/libs/main/introspection/piintrospection_containers_p.h
+++ b/libs/main/introspection/piintrospection_containers_p.h
@@ -79,6 +79,6 @@ BINARY_STREAM_READ(PIIntrospectionContainers::TypeInfo) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIIntrospectionContainers::TypeInfo)
+PIP_REGISTER_TYPENAME(PIIntrospectionContainers::TypeInfo)
 
 #endif // PIINTROSPECTION_CONTAINERS_P_H
diff --git a/libs/main/io_devices/pibinarylog.h b/libs/main/io_devices/pibinarylog.h
index 4e3cbe79..8fed65a1 100644
--- a/libs/main/io_devices/pibinarylog.h
+++ b/libs/main/io_devices/pibinarylog.h
@@ -993,8 +993,8 @@ inline PICout operator<<(PICout s, const PIBinaryLog::BinLogInfo & bi) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIBinaryLog::BinLogRecordInfo)
-__PIP_TYPENAME_DECLARE(PIBinaryLog::BinLogIndex)
+PIP_REGISTER_TYPENAME(PIBinaryLog::BinLogRecordInfo)
+PIP_REGISTER_TYPENAME(PIBinaryLog::BinLogIndex)
 
 #endif // PIP_HAS_FILESYSTEM
 
diff --git a/libs/main/io_devices/piconfig.h b/libs/main/io_devices/piconfig.h
index 7d4d03ff..94c336dd 100644
--- a/libs/main/io_devices/piconfig.h
+++ b/libs/main/io_devices/piconfig.h
@@ -979,7 +979,7 @@ T readDeviceSetting(const PIString & name, const T & def, const PIConfig::Entry
 	return v.value<T>();
 }
 
-__PIP_TYPENAME_DECLARE(PIConfig *)
-__PIP_TYPENAME_DECLARE(PIConfig::Entry *)
+PIP_REGISTER_TYPENAME(PIConfig *)
+PIP_REGISTER_TYPENAME(PIConfig::Entry *)
 
 #endif // PICONFIG_H
diff --git a/libs/main/io_devices/piethernet.h b/libs/main/io_devices/piethernet.h
index 45c63f37..ee20ceb1 100644
--- a/libs/main/io_devices/piethernet.h
+++ b/libs/main/io_devices/piethernet.h
@@ -708,8 +708,8 @@ inline bool operator!=(const PIEthernet::Interface & v0, const PIEthernet::Inter
 	return (v0.name != v1.name || v0.address != v1.address || v0.netmask != v1.netmask);
 }
 
-__PIP_TYPENAME_DECLARE(PIEthernet *)
-__PIP_TYPENAME_DECLARE(PIEthernet::Interface)
+PIP_REGISTER_TYPENAME(PIEthernet *)
+PIP_REGISTER_TYPENAME(PIEthernet::Interface)
 
 #endif // PIP_HAS_SOCKET
 
diff --git a/libs/main/io_devices/pifile.h b/libs/main/io_devices/pifile.h
index 5765f657..01c0848a 100644
--- a/libs/main/io_devices/pifile.h
+++ b/libs/main/io_devices/pifile.h
@@ -398,8 +398,8 @@ BINARY_STREAM_READ(PIFile::FileInfo) {
 		v.perm_group.raw >> v.perm_other.raw;
 	return s;
 }
-__PIP_TYPENAME_DECLARE(PIFile::FileInfo)
-__PIP_TYPENAME_DECLARE(PIFile::FileInfo::Flag)
+PIP_REGISTER_TYPENAME(PIFile::FileInfo)
+PIP_REGISTER_TYPENAME(PIFile::FileInfo::Flag)
 
 #endif // PIP_HAS_FILESYSTEM
 
diff --git a/libs/main/io_devices/pigpio.h b/libs/main/io_devices/pigpio.h
index f6cb377b..135ab10a 100644
--- a/libs/main/io_devices/pigpio.h
+++ b/libs/main/io_devices/pigpio.h
@@ -121,7 +121,7 @@ private:
 	NO_COPY_CLASS(PIGPIO);
 
 	struct PIP_EXPORT GPIOData {
-		static const char * __pip_typename__() { return "PIGPIO::GPIOData"; }
+		PIP_DECLARE_TYPENAME("PIGPIO::GPIOData")
 		GPIOData() {
 			dir = PIGPIO::In;
 			num = fd = -1;
diff --git a/libs/main/io_devices/piiodevice.h b/libs/main/io_devices/piiodevice.h
index cb94e6f3..1fc55580 100644
--- a/libs/main/io_devices/piiodevice.h
+++ b/libs/main/io_devices/piiodevice.h
@@ -630,9 +630,9 @@ private:
 #endif
 };
 
-__PIP_TYPENAME_DECLARE(PIIODevice *)
-__PIP_TYPENAME_DECLARE(const PIIODevice *)
-__PIP_TYPENAME_DECLARE(PIIODevice::DeviceMode)
-__PIP_TYPENAME_DECLARE(PIIODevice::FabricInfo)
+PIP_REGISTER_TYPENAME(PIIODevice *)
+PIP_REGISTER_TYPENAME(const PIIODevice *)
+PIP_REGISTER_TYPENAME(PIIODevice::DeviceMode)
+PIP_REGISTER_TYPENAME(PIIODevice::FabricInfo)
 
 #endif // PIIODEVICE_H
diff --git a/libs/main/io_devices/pipeer.h b/libs/main/io_devices/pipeer.h
index 2b16f6b6..2ce399c9 100644
--- a/libs/main/io_devices/pipeer.h
+++ b/libs/main/io_devices/pipeer.h
@@ -438,9 +438,9 @@ BINARY_STREAM_READ(PIPeer::PeerInfo) {
 	s >> v.name >> v.addresses >> v.dist >> v.neighbours >> v.cnt >> v.time;
 	return s;
 }
-__PIP_TYPENAME_DECLARE(PIPeer::PeerInfo)
-__PIP_TYPENAME_DECLARE(PIPeer::PeerInfo *)
-__PIP_TYPENAME_DECLARE(PIPeer::PeerInfo::PeerAddress)
+PIP_REGISTER_TYPENAME(PIPeer::PeerInfo)
+PIP_REGISTER_TYPENAME(PIPeer::PeerInfo *)
+PIP_REGISTER_TYPENAME(PIPeer::PeerInfo::PeerAddress)
 
 #endif // PIP_HAS_SOCKET && PIP_HAS_THREADS
 
diff --git a/libs/main/io_devices/piserial.h b/libs/main/io_devices/piserial.h
index 006507cd..f89c7060 100644
--- a/libs/main/io_devices/piserial.h
+++ b/libs/main/io_devices/piserial.h
@@ -381,7 +381,7 @@ BINARY_STREAM_READ(PISerial::DeviceInfo) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PISerial::DeviceInfo)
+PIP_REGISTER_TYPENAME(PISerial::DeviceInfo)
 
 #endif // PIP_HAS_SERIAL
 
diff --git a/libs/main/io_utils/pibasetransfer.h b/libs/main/io_utils/pibasetransfer.h
index c30e0e68..f3dbc360 100644
--- a/libs/main/io_utils/pibasetransfer.h
+++ b/libs/main/io_utils/pibasetransfer.h
@@ -409,7 +409,7 @@ inline PICout operator<<(PICout s, const PIBaseTransfer::Part & v) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIBaseTransfer::PacketType)
-__PIP_TYPENAME_DECLARE(PIBaseTransfer::Part)
+PIP_REGISTER_TYPENAME(PIBaseTransfer::PacketType)
+PIP_REGISTER_TYPENAME(PIBaseTransfer::Part)
 
 #endif // PIBASETRANSFER_H
diff --git a/libs/main/io_utils/piconnection.h b/libs/main/io_utils/piconnection.h
index 6acb76ef..5ff0d27a 100644
--- a/libs/main/io_utils/piconnection.h
+++ b/libs/main/io_utils/piconnection.h
@@ -444,7 +444,7 @@ public:
 
 	protected:
 		struct PIP_EXPORT DeviceData {
-			static const char * __pip_typename__() { return "PIConnection::DevicePool::DeviceData"; }
+			PIP_DECLARE_TYPENAME("PIConnection::DevicePool::DeviceData")
 			DeviceData(): dev(0), rthread(0), started(false) {}
 			~DeviceData();
 			PIIODevice * dev;
@@ -512,7 +512,7 @@ private:
 	PIIODevice * devByString(const PIString & s) const;
 
 	struct PIP_EXPORT Extractor {
-		static const char * __pip_typename__() { return "PIConnection::Extractor"; }
+		PIP_DECLARE_TYPENAME("PIConnection::Extractor")
 		Extractor(): extractor(0) {}
 		~Extractor();
 		PIPacketExtractor * extractor;
@@ -524,7 +524,7 @@ private:
 		PIOBJECT_SUBCLASS(Sender, PIObject);
 
 	public:
-		static const char * __pip_typename__() { return "PIConnection::Sender"; }
+		PIP_DECLARE_TYPENAME("PIConnection::Sender")
 		Sender(PIConnection * parent_ = 0);
 		~Sender() { stopAndWait(); }
 		PIConnection * parent;
@@ -564,6 +564,6 @@ public:
 static __DevicePoolContainer__ __device_pool_container__;
 #endif // PIP_HAS_THREADS
 
-__PIP_TYPENAME_DECLARE(PIConnection *)
+PIP_REGISTER_TYPENAME(PIConnection *)
 
 #endif // PICONNECTION_H
diff --git a/libs/main/io_utils/pidiagnostics.h b/libs/main/io_utils/pidiagnostics.h
index 41c07134..a39d03df 100644
--- a/libs/main/io_utils/pidiagnostics.h
+++ b/libs/main/io_utils/pidiagnostics.h
@@ -205,7 +205,7 @@ public:
 
 private:
 	struct PIP_EXPORT Entry {
-		static const char * __pip_typename__() { return "PIDiagnostics::Entry"; }
+		PIP_DECLARE_TYPENAME("PIDiagnostics::Entry")
 		ullong bytes_ok   = 0;
 		ullong bytes_fail = 0;
 		uint cnt_ok       = 0;
@@ -237,8 +237,8 @@ inline bool operator!=(const PIDiagnostics::Entry & f, const PIDiagnostics::Entr
 inline bool operator<(const PIDiagnostics::Entry & f, const PIDiagnostics::Entry & s) {
 	return f.bytes_ok < s.bytes_ok;
 }
-__PIP_TYPENAME_DECLARE(PIDiagnostics *)
-__PIP_TYPENAME_DECLARE(PIDiagnostics::Quality)
+PIP_REGISTER_TYPENAME(PIDiagnostics *)
+PIP_REGISTER_TYPENAME(PIDiagnostics::Quality)
 
 #endif // PIP_HAS_THREADS
 
diff --git a/libs/main/io_utils/pifiletransfer.h b/libs/main/io_utils/pifiletransfer.h
index f91d896a..7294d9b8 100644
--- a/libs/main/io_utils/pifiletransfer.h
+++ b/libs/main/io_utils/pifiletransfer.h
@@ -263,7 +263,7 @@ inline PICout operator<<(PICout s, const PIFileTransfer::PFTFileInfo & v) {
 	s.restoreControls();
 	return s;
 }
-__PIP_TYPENAME_DECLARE(PIFileTransfer::PFTFileInfo)
+PIP_REGISTER_TYPENAME(PIFileTransfer::PFTFileInfo)
 
 #endif // PIP_HAS_FILESYSTEM
 
diff --git a/libs/main/io_utils/pipacketextractor.h b/libs/main/io_utils/pipacketextractor.h
index 5cf5155e..526e7da4 100644
--- a/libs/main/io_utils/pipacketextractor.h
+++ b/libs/main/io_utils/pipacketextractor.h
@@ -232,6 +232,6 @@ private:
 	ullong missed;
 };
 
-__PIP_TYPENAME_DECLARE(PIPacketExtractor *)
+PIP_REGISTER_TYPENAME(PIPacketExtractor *)
 
 #endif // PIPACKETEXTRACTOR_H
diff --git a/libs/main/math/pievaluator.h b/libs/main/math/pievaluator.h
index c762c86c..5da72f91 100644
--- a/libs/main/math/pievaluator.h
+++ b/libs/main/math/pievaluator.h
@@ -426,10 +426,10 @@ BINARY_STREAM_READ(PIEvaluatorContent) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIEvaluatorTypes::Operation)
-__PIP_TYPENAME_DECLARE(PIEvaluatorTypes::Instruction)
-__PIP_TYPENAME_DECLARE(PIEvaluatorTypes::Element)
-__PIP_TYPENAME_DECLARE(PIEvaluatorTypes::Function)
-__PIP_TYPENAME_DECLARE(PIEvaluatorTypes::Variable)
+PIP_REGISTER_TYPENAME(PIEvaluatorTypes::Operation)
+PIP_REGISTER_TYPENAME(PIEvaluatorTypes::Instruction)
+PIP_REGISTER_TYPENAME(PIEvaluatorTypes::Element)
+PIP_REGISTER_TYPENAME(PIEvaluatorTypes::Function)
+PIP_REGISTER_TYPENAME(PIEvaluatorTypes::Variable)
 
 #endif // PIEVALUATOR_H
diff --git a/libs/main/math/piline.h b/libs/main/math/piline.h
index becdc4da..c811e395 100644
--- a/libs/main/math/piline.h
+++ b/libs/main/math/piline.h
@@ -211,9 +211,9 @@ typedef PILine<float> PILinef;
 typedef PILine<double> PILined;
 
 
-__PIP_TYPENAME_DECLARE(PILined)
-__PIP_TYPENAME_DECLARE(PILinei)
-__PIP_TYPENAME_DECLARE(PILinef)
-__PIP_TYPENAME_DECLARE(PILineu)
+PIP_REGISTER_TYPENAME(PILined)
+PIP_REGISTER_TYPENAME(PILinei)
+PIP_REGISTER_TYPENAME(PILinef)
+PIP_REGISTER_TYPENAME(PILineu)
 
 #endif // PILINE_H
diff --git a/libs/main/math/pimathcomplex.h b/libs/main/math/pimathcomplex.h
index 9e524aca..e1fb48ca 100644
--- a/libs/main/math/pimathcomplex.h
+++ b/libs/main/math/pimathcomplex.h
@@ -187,8 +187,8 @@ inline bool PIMathFloatNullCompare(const T v) {
 }
 
 
-__PIP_TYPENAME_DECLARE(complexf)
-__PIP_TYPENAME_DECLARE(complexd)
-__PIP_TYPENAME_DECLARE(complexld)
+PIP_REGISTER_TYPENAME(complexf)
+PIP_REGISTER_TYPENAME(complexd)
+PIP_REGISTER_TYPENAME(complexld)
 
 #endif // PIMATHCOMPLEX_H
diff --git a/libs/main/math/pimathmatrix.h b/libs/main/math/pimathmatrix.h
index 22e02be1..d1591211 100644
--- a/libs/main/math/pimathmatrix.h
+++ b/libs/main/math/pimathmatrix.h
@@ -1653,8 +1653,8 @@ PIMathMatrix<complex<T>> hermitian(const PIMathMatrix<complex<T>> & m) {
 }
 
 
-__PIP_TYPENAME_DECLARE(PIMathMatrixd)
-__PIP_TYPENAME_DECLARE(PIMathMatrixi)
+PIP_REGISTER_TYPENAME(PIMathMatrixd)
+PIP_REGISTER_TYPENAME(PIMathMatrixi)
 
 #undef PIMM_FOR
 #undef PIMM_FOR_A
diff --git a/libs/main/math/pimathvector.h b/libs/main/math/pimathvector.h
index f2784b13..b67a8c74 100644
--- a/libs/main/math/pimathvector.h
+++ b/libs/main/math/pimathvector.h
@@ -910,7 +910,7 @@ typedef PIMathVector<int> PIMathVectori;
 typedef PIMathVector<double> PIMathVectord;
 
 
-__PIP_TYPENAME_DECLARE(PIMathVectord)
-__PIP_TYPENAME_DECLARE(PIMathVectori)
+PIP_REGISTER_TYPENAME(PIMathVectord)
+PIP_REGISTER_TYPENAME(PIMathVectori)
 
 #endif // PIMATHVECTOR_H
diff --git a/libs/main/math/pipoint.h b/libs/main/math/pipoint.h
index bdf65b8e..fc9e372c 100644
--- a/libs/main/math/pipoint.h
+++ b/libs/main/math/pipoint.h
@@ -287,9 +287,9 @@ typedef PIPoint<float> PIPointf;
 typedef PIPoint<double> PIPointd;
 
 
-__PIP_TYPENAME_DECLARE(PIPointd)
-__PIP_TYPENAME_DECLARE(PIPointi)
-__PIP_TYPENAME_DECLARE(PIPointf)
-__PIP_TYPENAME_DECLARE(PIPointu)
+PIP_REGISTER_TYPENAME(PIPointd)
+PIP_REGISTER_TYPENAME(PIPointi)
+PIP_REGISTER_TYPENAME(PIPointf)
+PIP_REGISTER_TYPENAME(PIPointu)
 
 #endif // PIPOINT_H
diff --git a/libs/main/math/pirect.h b/libs/main/math/pirect.h
index c8696aa3..cf20e4e4 100644
--- a/libs/main/math/pirect.h
+++ b/libs/main/math/pirect.h
@@ -445,9 +445,9 @@ typedef PIRect<float> PIRectf;
 typedef PIRect<double> PIRectd;
 
 
-__PIP_TYPENAME_DECLARE(PIRectd)
-__PIP_TYPENAME_DECLARE(PIRecti)
-__PIP_TYPENAME_DECLARE(PIRectf)
-__PIP_TYPENAME_DECLARE(PIRectu)
+PIP_REGISTER_TYPENAME(PIRectd)
+PIP_REGISTER_TYPENAME(PIRecti)
+PIP_REGISTER_TYPENAME(PIRectf)
+PIP_REGISTER_TYPENAME(PIRectu)
 
 #endif // PIRECT_H
diff --git a/libs/main/mqtt_common/pimqtttypes.h b/libs/main/mqtt_common/pimqtttypes.h
index 9591bce7..1ab6983d 100644
--- a/libs/main/mqtt_common/pimqtttypes.h
+++ b/libs/main/mqtt_common/pimqtttypes.h
@@ -183,8 +183,8 @@ inline PIBinaryStream<P> & operator>>(PIBinaryStream<P> & s, MessageMutable & v)
 
 }; // namespace PIMQTT
 
-__PIP_TYPENAME_DECLARE(PIMQTT::Error)
-__PIP_TYPENAME_DECLARE(PIMQTT::MessageConst)
+PIP_REGISTER_TYPENAME(PIMQTT::Error)
+PIP_REGISTER_TYPENAME(PIMQTT::MessageConst)
 
 
 #endif
diff --git a/libs/main/resources/piresourcesstorage.h b/libs/main/resources/piresourcesstorage.h
index ed5cfad0..c4c74ec5 100644
--- a/libs/main/resources/piresourcesstorage.h
+++ b/libs/main/resources/piresourcesstorage.h
@@ -150,7 +150,7 @@ BINARY_STREAM_READ(PIResourcesStorage::__RCEntry) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIResourcesStorage::__RCEntry)
-__PIP_TYPENAME_DECLARE(PIResourcesStorage::Section *)
+PIP_REGISTER_TYPENAME(PIResourcesStorage::__RCEntry)
+PIP_REGISTER_TYPENAME(PIResourcesStorage::Section *)
 
 #endif // PIRESOURCES_P_H
diff --git a/libs/main/serialization/pichunkstream.h b/libs/main/serialization/pichunkstream.h
index 617af220..57871c04 100644
--- a/libs/main/serialization/pichunkstream.h
+++ b/libs/main/serialization/pichunkstream.h
@@ -243,7 +243,7 @@ private:
 	void _init();
 
 	struct CacheEntry {
-		static const char * __pip_typename__() { return "PIChunkStream::CacheEntry"; }
+		PIP_DECLARE_TYPENAME("PIChunkStream::CacheEntry")
 		CacheEntry(int s = 0, int l = 0, int b = 0): start(s), length(l), size_bytes(b) {}
 		int start;
 		int length;
diff --git a/libs/main/serialization/pijson.h b/libs/main/serialization/pijson.h
index 2deda925..0f3fd2c6 100644
--- a/libs/main/serialization/pijson.h
+++ b/libs/main/serialization/pijson.h
@@ -254,6 +254,6 @@ inline PICout operator<<(PICout s, const PIJSON & v) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIJSON)
+PIP_REGISTER_TYPENAME(PIJSON)
 
 #endif // PIJSON_H
diff --git a/libs/main/state_machine/pistatemachine_state.h b/libs/main/state_machine/pistatemachine_state.h
index 145a42e5..6e672fbb 100644
--- a/libs/main/state_machine/pistatemachine_state.h
+++ b/libs/main/state_machine/pistatemachine_state.h
@@ -256,6 +256,6 @@ inline PICout operator<<(PICout c, PIStateBase * s) {
 	return c;
 }
 
-__PIP_TYPENAME_DECLARE(PIStateBase *)
+PIP_REGISTER_TYPENAME(PIStateBase *)
 
 #endif
diff --git a/libs/main/state_machine/pistatemachine_transition.h b/libs/main/state_machine/pistatemachine_transition.h
index 6c6f7e50..78d536d2 100644
--- a/libs/main/state_machine/pistatemachine_transition.h
+++ b/libs/main/state_machine/pistatemachine_transition.h
@@ -147,6 +147,6 @@ private:
 #endif
 };
 
-__PIP_TYPENAME_DECLARE(PITransitionBase *)
+PIP_REGISTER_TYPENAME(PITransitionBase *)
 
 #endif
diff --git a/libs/main/system/pihidevice.h b/libs/main/system/pihidevice.h
index 03b62998..4f417bb2 100644
--- a/libs/main/system/pihidevice.h
+++ b/libs/main/system/pihidevice.h
@@ -272,12 +272,12 @@ private:
 	float dead_zone = 0.f;
 };
 
-__PIP_TYPENAME_DECLARE(PIHIDevice::Event)
+PIP_REGISTER_TYPENAME(PIHIDevice::Event)
 
 #endif // PIP_HAS_THREADS
 
-__PIP_TYPENAME_DECLARE(PIHIDeviceInfo)
-__PIP_TYPENAME_DECLARE(PIHIDeviceInfo::AxisInfo)
-__PIP_TYPENAME_DECLARE(PIHIDeviceInfo::ButtonInfo)
+PIP_REGISTER_TYPENAME(PIHIDeviceInfo)
+PIP_REGISTER_TYPENAME(PIHIDeviceInfo::AxisInfo)
+PIP_REGISTER_TYPENAME(PIHIDeviceInfo::ButtonInfo)
 
 #endif
diff --git a/libs/main/system/piplugin.h b/libs/main/system/piplugin.h
index 13cc1ad2..aede6ba8 100644
--- a/libs/main/system/piplugin.h
+++ b/libs/main/system/piplugin.h
@@ -300,7 +300,7 @@ private:
 };
 
 
-__PIP_TYPENAME_DECLARE(PIPluginInfo *)
+PIP_REGISTER_TYPENAME(PIPluginInfo *)
 
 #endif // PIP_HAS_DYNLIB
 
diff --git a/libs/main/system/pisysteminfo.cpp b/libs/main/system/pisysteminfo.cpp
index 8852406e..d81e1463 100644
--- a/libs/main/system/pisysteminfo.cpp
+++ b/libs/main/system/pisysteminfo.cpp
@@ -80,7 +80,7 @@ struct String3 {
 	PIString mp, type, label;
 };
 
-__PIP_TYPENAME_DECLARE(String3)
+PIP_REGISTER_TYPENAME(String3)
 
 PIVector<PISystemInfo::MountInfo> PISystemInfo::mountInfo(bool ignore_cache) {
 	static PIVector<PISystemInfo::MountInfo> cache;
diff --git a/libs/main/system/pisysteminfo.h b/libs/main/system/pisysteminfo.h
index a746de4e..cb583c6f 100644
--- a/libs/main/system/pisysteminfo.h
+++ b/libs/main/system/pisysteminfo.h
@@ -150,6 +150,6 @@ inline PICout operator<<(PICout s, const PISystemInfo::MountInfo & v) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PISystemInfo::MountInfo)
+PIP_REGISTER_TYPENAME(PISystemInfo::MountInfo)
 
 #endif // PISYSTEMINFO_H
diff --git a/libs/main/text/pichar.h b/libs/main/text/pichar.h
index 4276e753..57319d71 100644
--- a/libs/main/text/pichar.h
+++ b/libs/main/text/pichar.h
@@ -271,6 +271,6 @@ inline bool operator<=(ushort v, const PIChar & c) {
 }
 
 
-__PIP_TYPENAME_DECLARE(PIChar)
+PIP_REGISTER_TYPENAME(PIChar)
 
 #endif // PICHAR_H
diff --git a/libs/main/text/piconstchars.h b/libs/main/text/piconstchars.h
index 823f8f5c..1bd26a1a 100644
--- a/libs/main/text/piconstchars.h
+++ b/libs/main/text/piconstchars.h
@@ -262,6 +262,6 @@ inline uint piHash(const PIConstChars & s) {
 	return s.hash();
 }
 
-__PIP_TYPENAME_DECLARE(PIConstChars)
+PIP_REGISTER_TYPENAME(PIConstChars)
 
 #endif // PICONSTCHARS_H
diff --git a/libs/main/text/piregularexpression.h b/libs/main/text/piregularexpression.h
index 7c40db44..b7130ce8 100644
--- a/libs/main/text/piregularexpression.h
+++ b/libs/main/text/piregularexpression.h
@@ -131,7 +131,7 @@ public:
 		Matcher & operator=(const Matcher &) = default;
 
 		struct Group {
-			static const char * __pip_typename__() { return "PIRegularExpression::Matcher::Group"; }
+			PIP_DECLARE_TYPENAME("PIRegularExpression::Matcher::Group")
 			int index = 0;
 			int size  = 0;
 		};
diff --git a/libs/main/text/pistring.h b/libs/main/text/pistring.h
index 9229ff2a..56eed468 100644
--- a/libs/main/text/pistring.h
+++ b/libs/main/text/pistring.h
@@ -2052,7 +2052,7 @@ inline PIString piStringify(const T & v) {
 }
 
 
-__PIP_TYPENAME_DECLARE(PIString)
-__PIP_TYPENAME_DECLARE(PIString *)
+PIP_REGISTER_TYPENAME(PIString)
+PIP_REGISTER_TYPENAME(PIString *)
 
 #endif // PISTRING_H
diff --git a/libs/main/text/pistringlist.h b/libs/main/text/pistringlist.h
index 8c75b476..6542a26a 100644
--- a/libs/main/text/pistringlist.h
+++ b/libs/main/text/pistringlist.h
@@ -217,6 +217,6 @@ inline PICout operator<<(PICout s, const PIStringList & v) {
 }
 
 
-__PIP_TYPENAME_DECLARE(PIStringList)
+PIP_REGISTER_TYPENAME(PIStringList)
 
 #endif // PISTRINGLIST_H
diff --git a/libs/main/thread/pithread.h b/libs/main/thread/pithread.h
index b5e8d216..c6c50be5 100644
--- a/libs/main/thread/pithread.h
+++ b/libs/main/thread/pithread.h
@@ -336,7 +336,7 @@ private:
 	void setThreadName();
 };
 
-__PIP_TYPENAME_DECLARE(PIThread *)
+PIP_REGISTER_TYPENAME(PIThread *)
 
 #endif // PIP_HAS_THREADS
 
diff --git a/libs/main/thread/pithreadpoolworker.h b/libs/main/thread/pithreadpoolworker.h
index 924cb21e..2e9e948d 100644
--- a/libs/main/thread/pithreadpoolworker.h
+++ b/libs/main/thread/pithreadpoolworker.h
@@ -154,13 +154,13 @@ public:
 
 private:
 	struct Worker {
-		static const char * __pip_typename__() { return "PIThreadPoolWorker::Worker"; }
+		PIP_DECLARE_TYPENAME("PIThreadPoolWorker::Worker")
 		PIThread thread;
 		PIThreadNotifier notifier;
 		std::atomic_int64_t in_work = {-1};
 	};
 	struct Task {
-		static const char * __pip_typename__() { return "PIThreadPoolWorker::Task"; }
+		PIP_DECLARE_TYPENAME("PIThreadPoolWorker::Task")
 		bool isValid() const { return func != nullptr; }
 		PIObject * context                = nullptr;
 		std::function<void(int64_t)> func = nullptr;
diff --git a/libs/main/thread/pitimer.h b/libs/main/thread/pitimer.h
index 3c07fe13..4a219d0e 100644
--- a/libs/main/thread/pitimer.h
+++ b/libs/main/thread/pitimer.h
@@ -247,7 +247,7 @@ protected:
 	PIConditionVariable event;
 };
 
-__PIP_TYPENAME_DECLARE(PITimer::Delimiter)
+PIP_REGISTER_TYPENAME(PITimer::Delimiter)
 
 #endif // PIP_HAS_THREADS
 
diff --git a/libs/main/types/pibitarray.h b/libs/main/types/pibitarray.h
index 8e784eba..e5ffaeca 100644
--- a/libs/main/types/pibitarray.h
+++ b/libs/main/types/pibitarray.h
@@ -310,6 +310,6 @@ private:
 PIP_EXPORT PICout operator<<(PICout s, const PIBitArray & ba);
 
 
-__PIP_TYPENAME_DECLARE(PIBitArray)
+PIP_REGISTER_TYPENAME(PIBitArray)
 
 #endif // PIBITARRAY_H
diff --git a/libs/main/types/pibytearray.h b/libs/main/types/pibytearray.h
index a123838c..ddfac0e4 100644
--- a/libs/main/types/pibytearray.h
+++ b/libs/main/types/pibytearray.h
@@ -1362,8 +1362,8 @@ T piDeserialize(const PIByteArray & data) {
 }
 
 
-__PIP_TYPENAME_DECLARE(PIByteArray)
-__PIP_TYPENAME_DECLARE(PIByteArray *)
-__PIP_TYPENAME_DECLARE(PIByteArray (*)(PIByteArray))
+PIP_REGISTER_TYPENAME(PIByteArray)
+PIP_REGISTER_TYPENAME(PIByteArray *)
+PIP_REGISTER_TYPENAME(PIByteArray (*)(PIByteArray))
 
 #endif // PIBYTEARRAY_H
diff --git a/libs/main/types/pidatetime.h b/libs/main/types/pidatetime.h
index 28a51331..2ebe5018 100644
--- a/libs/main/types/pidatetime.h
+++ b/libs/main/types/pidatetime.h
@@ -404,8 +404,8 @@ inline bool operator>=(const PIDateTime & t0, const PIDateTime & t1) {
 PIP_EXPORT PICout operator<<(PICout s, const PIDateTime & v);
 
 
-__PIP_TYPENAME_DECLARE(PITime)
-__PIP_TYPENAME_DECLARE(PIDate)
-__PIP_TYPENAME_DECLARE(PIDateTime)
+PIP_REGISTER_TYPENAME(PITime)
+PIP_REGISTER_TYPENAME(PIDate)
+PIP_REGISTER_TYPENAME(PIDateTime)
 
 #endif // PIDATETIME_H
diff --git a/libs/main/types/pinetworkaddress.h b/libs/main/types/pinetworkaddress.h
index 8977ae10..ea62bd66 100644
--- a/libs/main/types/pinetworkaddress.h
+++ b/libs/main/types/pinetworkaddress.h
@@ -141,6 +141,6 @@ inline PICout operator<<(PICout s, const PINetworkAddress & v) {
 }
 
 
-__PIP_TYPENAME_DECLARE(PINetworkAddress)
+PIP_REGISTER_TYPENAME(PINetworkAddress)
 
 #endif // PINETWORKADDRESS_H
diff --git a/libs/main/types/pipropertystorage.h b/libs/main/types/pipropertystorage.h
index 8d80e736..d9424481 100644
--- a/libs/main/types/pipropertystorage.h
+++ b/libs/main/types/pipropertystorage.h
@@ -338,6 +338,6 @@ BINARY_STREAM_READ(PIPropertyStorage) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIPropertyStorage::Property)
+PIP_REGISTER_TYPENAME(PIPropertyStorage::Property)
 
 #endif // PIPROPERTYSTORAGE_H
diff --git a/libs/main/types/pisystemtime.h b/libs/main/types/pisystemtime.h
index 8f46829d..289493e2 100644
--- a/libs/main/types/pisystemtime.h
+++ b/libs/main/types/pisystemtime.h
@@ -521,7 +521,7 @@ private:
 };
 
 
-__PIP_TYPENAME_DECLARE(PISystemTime)
-__PIP_TYPENAME_DECLARE(PISystemTime::Frequency)
+PIP_REGISTER_TYPENAME(PISystemTime)
+PIP_REGISTER_TYPENAME(PISystemTime::Frequency)
 
 #endif // PITIME_H
diff --git a/libs/main/types/pivaluetree.h b/libs/main/types/pivaluetree.h
index af48cb6a..f860d82f 100644
--- a/libs/main/types/pivaluetree.h
+++ b/libs/main/types/pivaluetree.h
@@ -361,6 +361,6 @@ inline PICout operator<<(PICout s, const PIValueTree & v) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIValueTree)
+PIP_REGISTER_TYPENAME(PIValueTree)
 
 #endif // PIVALUETREE_H
diff --git a/libs/main/types/pivariant.h b/libs/main/types/pivariant.h
index 258a7197..26217b95 100644
--- a/libs/main/types/pivariant.h
+++ b/libs/main/types/pivariant.h
@@ -1341,7 +1341,7 @@ inline PICout operator<<(PICout s, const PIVariant & v) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIVariant)
-__PIP_TYPENAME_DECLARE(__PIVariantInfo__ *)
+PIP_REGISTER_TYPENAME(PIVariant)
+PIP_REGISTER_TYPENAME(__PIVariantInfo__ *)
 
 #endif // PIVARIANT_H
diff --git a/libs/main/types/pivariantsimple.h b/libs/main/types/pivariantsimple.h
index 14c4b507..cfd0a3de 100644
--- a/libs/main/types/pivariantsimple.h
+++ b/libs/main/types/pivariantsimple.h
@@ -198,6 +198,6 @@ private:
 
 REGISTER_PIVARIANTSIMPLE(std::function<void(void *)>)
 
-__PIP_TYPENAME_DECLARE(PIVariantSimple)
+PIP_REGISTER_TYPENAME(PIVariantSimple)
 
 #endif // PIVARIANTSIMPLE_H
diff --git a/libs/main/types/pivarianttypes.h b/libs/main/types/pivarianttypes.h
index 57bfa043..061d8f40 100644
--- a/libs/main/types/pivarianttypes.h
+++ b/libs/main/types/pivarianttypes.h
@@ -468,7 +468,7 @@ BINARY_STREAM_READ(PIVariantTypes::IODevice) {
 	return s;
 }
 
-__PIP_TYPENAME_DECLARE(PIVariantTypes::Color)
-__PIP_TYPENAME_DECLARE(PIVariantTypes::Enumerator)
+PIP_REGISTER_TYPENAME(PIVariantTypes::Color)
+PIP_REGISTER_TYPENAME(PIVariantTypes::Enumerator)
 
 #endif // PIVARIANTYPES_H
diff --git a/libs/main/units/piunits_base.h b/libs/main/units/piunits_base.h
index 8619f1d7..a98c4009 100644
--- a/libs/main/units/piunits_base.h
+++ b/libs/main/units/piunits_base.h
@@ -242,6 +242,6 @@ PIP_EXPORT PIVector<Class::Internal::ClassBase *> allClasses();
 
 } // namespace PIUnits
 
-__PIP_TYPENAME_DECLARE(PIUnits::Class::Internal::ClassBase *)
+PIP_REGISTER_TYPENAME(PIUnits::Class::Internal::ClassBase *)
 
 #endif
diff --git a/libs/main/units/piunits_prefix.h b/libs/main/units/piunits_prefix.h
index 9f3a0701..63f5ca8e 100644
--- a/libs/main/units/piunits_prefix.h
+++ b/libs/main/units/piunits_prefix.h
@@ -91,7 +91,7 @@ private:
 	static PIString valueToString(double v, void * type_class, int type, char format = 'g', int prec = 5);
 
 	struct P {
-		static const char * __pip_typename__() { return "PIUnits::Prefix::P"; }
+		PIP_DECLARE_TYPENAME("PIUnits::Prefix::P")
 		PIString name;
 		PIString prefix;
 		int pow;
diff --git a/libs/mqtt_client/pimqttclient.cpp b/libs/mqtt_client/pimqttclient.cpp
index 9c2c066c..1833e676 100644
--- a/libs/mqtt_client/pimqttclient.cpp
+++ b/libs/mqtt_client/pimqttclient.cpp
@@ -28,14 +28,14 @@ struct PIMQTT::Client::Endpoint: public PIHTTP::ServerEndpoint {
 	PIMQTT::Client::MessageFunction function;
 };
 
-__PIP_TYPENAME_DECLARE(PIMQTT::Client::Endpoint)
+PIP_REGISTER_TYPENAME(PIMQTT::Client::Endpoint)
 
 struct TopicUsage {
 	int counter     = 0;
 	PIMQTT::QoS qos = PIMQTT::QoS::Level1;
 };
 
-__PIP_TYPENAME_DECLARE(TopicUsage)
+PIP_REGISTER_TYPENAME(TopicUsage)
 
 struct EndpointsStorage {
 	PIMap<uint, PIMap<PIString, PIVector<PIMQTT::Client::Endpoint>>> prepared; // [priority][topic] -> endpoints
diff --git a/utils/cloud_dispatcher/cloudserver.h b/utils/cloud_dispatcher/cloudserver.h
index 2b97e4b1..217ef65e 100644
--- a/utils/cloud_dispatcher/cloudserver.h
+++ b/utils/cloud_dispatcher/cloudserver.h
@@ -30,6 +30,6 @@ private:
 	PIMutex mutex_clients;
 };
 
-__PIP_TYPENAME_DECLARE(CloudServer *)
+PIP_REGISTER_TYPENAME(CloudServer *)
 
 #endif // CLOUDSERVER_H
diff --git a/utils/cloud_dispatcher/dispatcherclient.h b/utils/cloud_dispatcher/dispatcherclient.h
index 2d398079..fe0bee12 100644
--- a/utils/cloud_dispatcher/dispatcherclient.h
+++ b/utils/cloud_dispatcher/dispatcherclient.h
@@ -45,8 +45,8 @@ private:
 	uint client_id;
 };
 
-__PIP_TYPENAME_DECLARE(DispatcherClient *)
-__PIP_TYPENAME_DECLARE(const DispatcherClient *)
+PIP_REGISTER_TYPENAME(DispatcherClient *)
+PIP_REGISTER_TYPENAME(const DispatcherClient *)
 
 
 #endif // DISPATCHERCLIENT_H
diff --git a/utils/qt_support/ts_file.h b/utils/qt_support/ts_file.h
index 5501d131..a8c75fa4 100644
--- a/utils/qt_support/ts_file.h
+++ b/utils/qt_support/ts_file.h
@@ -52,5 +52,5 @@ bool write(const PIString & path, const Content & content, bool no_obsolete);
 
 } // namespace TSFile
 
-__PIP_TYPENAME_DECLARE(TSFile::Message)
-__PIP_TYPENAME_DECLARE(TSFile::Context)
+PIP_REGISTER_TYPENAME(TSFile::Message)
+PIP_REGISTER_TYPENAME(TSFile::Context)
diff --git a/utils/resources_compiler/parser.h b/utils/resources_compiler/parser.h
index b2978439..a7a6a473 100644
--- a/utils/resources_compiler/parser.h
+++ b/utils/resources_compiler/parser.h
@@ -23,7 +23,7 @@ PIVector<ParserSection> parse(const PIString & path);
 PIVector<ParserSection> parseConf(PIFile & file, const PIString & dir);
 PIVector<ParserSection> parseQRC(PIFile & file, const PIString & dir);
 
-__PIP_TYPENAME_DECLARE(ParserEntry)
-__PIP_TYPENAME_DECLARE(ParserSection)
+PIP_REGISTER_TYPENAME(ParserEntry)
+PIP_REGISTER_TYPENAME(ParserSection)
 
 #endif // PIRC_PARSER_H
diff --git a/utils/system_daemon/daemon.h b/utils/system_daemon/daemon.h
index a8418f1e..74df13b6 100644
--- a/utils/system_daemon/daemon.h
+++ b/utils/system_daemon/daemon.h
@@ -94,7 +94,7 @@ private:
 		PIOBJECT_SUBCLASS(Remote, PIThread)
 
 	public:
-		static const char * __pip_typename__() { return "Daemon::Remote"; }
+		PIP_DECLARE_TYPENAME("Daemon::Remote")
 		explicit Remote(const PIString & n = PIString());
 		~Remote();
 		void sendFiles(const PIString & dir, const PIStringList & fl) { startAction(Daemon::CopyFiles, dir, fl); }
diff --git a/utils/system_daemon/file_manager.h b/utils/system_daemon/file_manager.h
index c993dc2c..d1a49bf9 100644
--- a/utils/system_daemon/file_manager.h
+++ b/utils/system_daemon/file_manager.h
@@ -79,7 +79,7 @@ private:
 	typedef PIPair<PIString, PIString> SSPair;
 };
 
-__PIP_TYPENAME_DECLARE(FileManager::Action)
+PIP_REGISTER_TYPENAME(FileManager::Action)
 
 
 #endif // FILE_MANAGER_H