diff --git a/libs/piqt_utils/piqt_connection_edit.cpp b/libs/piqt_utils/piqt_connection_edit.cpp
index 74bbc64..d7d53d7 100644
--- a/libs/piqt_utils/piqt_connection_edit.cpp
+++ b/libs/piqt_utils/piqt_connection_edit.cpp
@@ -18,7 +18,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
 	connect(ui->blockView, SIGNAL(schemeAction(BlockItemBase::Action, QList<QGraphicsItem *>)), this, SLOT(recreateRequest()));
 	connect(ui->blockView->scene(), SIGNAL(selectionChanged()), this, SLOT(selectionChanged()));
 	conn                      = 0;
-	PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIIODevice::DeviceMode");
+	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIIODevice::DeviceMode");
 	if (ei) {
 		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
@@ -29,7 +29,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
 #endif
 	}
 	ui->comboMode->setCurrentIndex(ui->comboMode->count() - 1);
-	ei = PICODEINFO->enums().value("PIIODevice::DeviceOption");
+	ei = PICODEINFO::enums().value("PIIODevice::DeviceOption");
 	if (ei) {
 		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
 			QCheckBox * cb = new QCheckBox();
@@ -42,7 +42,7 @@ ConnectionEdit::ConnectionEdit(QWidget * parent): QDialog(parent) {
 			ui->layoutOptions->addWidget(cb);
 		}
 	}
-	ei = PICODEINFO->enums().value("PIPacketExtractor::SplitMode");
+	ei = PICODEINFO::enums().value("PIPacketExtractor::SplitMode");
 	if (ei) {
 		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
diff --git a/libs/piqt_utils/piqt_connection_view.cpp b/libs/piqt_utils/piqt_connection_view.cpp
index ebfcca6..2ceac0e 100644
--- a/libs/piqt_utils/piqt_connection_view.cpp
+++ b/libs/piqt_utils/piqt_connection_view.cpp
@@ -83,7 +83,7 @@ FilterItem::FilterItem(): BlockItem() {
 void FilterItem::rename() {
 	text_name->setText(name());
 	QString ms;
-	PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIPacketExtractor::SplitMode", 0);
+	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIPacketExtractor::SplitMode", 0);
 	if (ei) {
 		piForeachC(PICodeInfo::EnumeratorInfo & i, ei->members)
 			if (i.value == mode()) {
diff --git a/libs/piqt_utils/piqt_iodevice_edit_dialog.cpp b/libs/piqt_utils/piqt_iodevice_edit_dialog.cpp
index f831543..5a018bc 100644
--- a/libs/piqt_utils/piqt_iodevice_edit_dialog.cpp
+++ b/libs/piqt_utils/piqt_iodevice_edit_dialog.cpp
@@ -11,7 +11,7 @@
 IODeviceEditDialog::IODeviceEditDialog(QWidget * parent): QDialog(parent) {
 	ui = new Ui::IODeviceEditDialog();
 	ui->setupUi(this);
-	PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIIODevice::DeviceMode");
+	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIIODevice::DeviceMode");
 	if (ei) {
 		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members)
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
@@ -22,7 +22,7 @@ IODeviceEditDialog::IODeviceEditDialog(QWidget * parent): QDialog(parent) {
 #endif
 	}
 	ui->comboMode->setCurrentIndex(ui->comboMode->count() - 1);
-	ei = PICODEINFO->enums().value("PIIODevice::DeviceOption");
+	ei = PICODEINFO::enums().value("PIIODevice::DeviceOption");
 	if (ei) {
 		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
 			QCheckBox * cb = new QCheckBox();
diff --git a/utils/piintrospector/piintrospector.cpp b/utils/piintrospector/piintrospector.cpp
index e53236f..2ac4536 100644
--- a/utils/piintrospector/piintrospector.cpp
+++ b/utils/piintrospector/piintrospector.cpp
@@ -27,7 +27,7 @@ QPIIntrospector::QPIIntrospector(QWidget * parent): EMainWindow(parent), peer("_
 	// CONNECTU(&peer, dataReceivedEvent, this, reqProcPIEvents);
 	session.addEntry(this);
 	session.addEntry(tabWidgetMain);
-	PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIIntrospection::InfoTypes");
+	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIIntrospection::InfoTypes");
 	if (ei) {
 		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)
diff --git a/utils/piintrospector/threads_view.cpp b/utils/piintrospector/threads_view.cpp
index b086dbf..9edc223 100644
--- a/utils/piintrospector/threads_view.cpp
+++ b/utils/piintrospector/threads_view.cpp
@@ -22,7 +22,7 @@ enum ColumnThreads {
 
 
 ThreadsModel::ThreadsModel() {
-	PICodeInfo::EnumInfo * ei = PICODEINFO->enums().value("PIIntrospectionThreads::ThreadState");
+	PICodeInfo::EnumInfo * ei = PICODEINFO::enums().value("PIIntrospectionThreads::ThreadState");
 	if (ei) {
 		piForeachC(PICodeInfo::EnumeratorInfo & e, ei->members) {
 #if PIP_VERSION >= PIP_MAKE_VERSION(2, 39, 0)