diff --git a/examples/android/main.go b/examples/android/main.go
index fed6cfdc..71455ef4 100644
--- a/examples/android/main.go
+++ b/examples/android/main.go
@@ -11,7 +11,7 @@ func myRealMainFunc() {
 
 	qt.NewQApplication(os.Args)
 
-	btn := qt.NewQPushButton2("Hello world!")
+	btn := qt.NewQPushButton3("Hello world!")
 	btn.SetFixedWidth(320)
 
 	var counter int = 0
diff --git a/examples/helloworld/main.go b/examples/helloworld/main.go
index 1aa7bd23..b82a537d 100644
--- a/examples/helloworld/main.go
+++ b/examples/helloworld/main.go
@@ -11,7 +11,7 @@ func main() {
 
 	qt.NewQApplication(os.Args)
 
-	btn := qt.NewQPushButton2("Hello world!")
+	btn := qt.NewQPushButton3("Hello world!")
 	btn.SetFixedWidth(320)
 
 	var counter int = 0
diff --git a/examples/libraries/extras-scintillaedit/main.go b/examples/libraries/extras-scintillaedit/main.go
index f99fffdb..3212fcb7 100644
--- a/examples/libraries/extras-scintillaedit/main.go
+++ b/examples/libraries/extras-scintillaedit/main.go
@@ -13,7 +13,7 @@ func main() {
 
 	qt.NewQApplication(os.Args)
 
-	area := scintillaedit.NewScintillaEdit()
+	area := scintillaedit.NewScintillaEdit2()
 	area.SetFixedSize2(640, 480)
 	area.Show()
 
diff --git a/examples/libraries/qt-qprintsupport/main.go b/examples/libraries/qt-qprintsupport/main.go
index d3da7e65..513ba010 100644
--- a/examples/libraries/qt-qprintsupport/main.go
+++ b/examples/libraries/qt-qprintsupport/main.go
@@ -11,12 +11,12 @@ func main() {
 
 	qt.NewQApplication(os.Args)
 
-	btn := qt.NewQPushButton2("QPrintSupport sample")
+	btn := qt.NewQPushButton3("QPrintSupport sample")
 	btn.SetFixedWidth(320)
 
 	btn.OnPressed(func() {
 
-		dlg := qprintsupport.NewQPrintDialog2()
+		dlg := qprintsupport.NewQPrintDialog3()
 		dlg.OnFinished(func(int) {
 			dlg.DeleteLater()
 		})
diff --git a/examples/libraries/qt6/main.go b/examples/libraries/qt6/main.go
index f1d0861e..da291ca1 100644
--- a/examples/libraries/qt6/main.go
+++ b/examples/libraries/qt6/main.go
@@ -11,7 +11,7 @@ func main() {
 
 	qt.NewQApplication(os.Args)
 
-	btn := qt.NewQPushButton2("Hello world!")
+	btn := qt.NewQPushButton3("Hello world!")
 	btn.SetFixedWidth(320)
 
 	var counter int = 0
diff --git a/examples/libraries/restricted-extras-qscintilla/main.go b/examples/libraries/restricted-extras-qscintilla/main.go
index 6e06bfb8..26c0bf9c 100644
--- a/examples/libraries/restricted-extras-qscintilla/main.go
+++ b/examples/libraries/restricted-extras-qscintilla/main.go
@@ -11,7 +11,7 @@ func main() {
 
 	qt.NewQApplication(os.Args)
 
-	area := qscintilla.NewQsciScintilla()
+	area := qscintilla.NewQsciScintilla2()
 	area.SetFixedSize2(640, 480)
 	area.Show()
 
diff --git a/examples/marshalling/marshalling_test.go b/examples/marshalling/marshalling_test.go
index 65be1985..bc105433 100644
--- a/examples/marshalling/marshalling_test.go
+++ b/examples/marshalling/marshalling_test.go
@@ -12,7 +12,7 @@ func testMarshalling(t *testing.T) {
 
 	// Bool
 	t.Run("Bool", func(t *testing.T) {
-		b := qt.NewQCheckBox()
+		b := qt.NewQCheckBox2()
 		expect := true
 		b.SetChecked(expect)
 
@@ -37,7 +37,7 @@ func testMarshalling(t *testing.T) {
 
 	// QString
 	t.Run("QString", func(t *testing.T) {
-		w := qt.NewQWidget()
+		w := qt.NewQWidget2()
 		expect := "Sample text"
 		w.SetToolTip(expect)
 
@@ -60,7 +60,7 @@ func testMarshalling(t *testing.T) {
 
 	// QStringList
 	t.Run("QStringList", func(t *testing.T) {
-		c := qt.NewQInputDialog()
+		c := qt.NewQInputDialog2()
 		expect := []string{"foo", "bar", "baz", "quux"}
 		c.SetComboBoxItems(expect)
 
diff --git a/examples/mdoutliner/main.go b/examples/mdoutliner/main.go
index 61d1e59a..4cf7a494 100644
--- a/examples/mdoutliner/main.go
+++ b/examples/mdoutliner/main.go
@@ -34,19 +34,19 @@ type AppTab struct {
 func NewAppTab() *AppTab {
 	var ret AppTab
 
-	tab := qt.NewQWidget()
+	tab := qt.NewQWidget2()
 	ret.tab = tab
 
-	layout := qt.NewQHBoxLayout2(tab)
+	layout := qt.NewQHBoxLayout(tab)
 
-	panes := qt.NewQSplitter()
+	panes := qt.NewQSplitter2()
 	layout.AddWidget(panes.QWidget)
 
-	ret.outline = qt.NewQListWidget2(tab)
+	ret.outline = qt.NewQListWidget(tab)
 	panes.AddWidget(ret.outline.QWidget)
 	ret.outline.OnCurrentItemChanged(ret.handleJumpToBookmark)
 
-	ret.textArea = qt.NewQTextEdit3(tab)
+	ret.textArea = qt.NewQTextEdit(tab)
 	ret.textArea.OnTextChanged(ret.handleTextChanged)
 
 	panes.AddWidget(ret.textArea.QWidget)
@@ -60,12 +60,12 @@ func NewAppWindow() *AppWindow {
 
 	ret := AppWindow{}
 
-	ret.w = qt.NewQMainWindow()
+	ret.w = qt.NewQMainWindow2()
 	ret.w.SetWindowTitle("Markdown Outliner")
 
 	// Menu
 
-	mnu := qt.NewQMenuBar()
+	mnu := qt.NewQMenuBar2()
 	fileMenu := mnu.AddMenuWithTitle("&File")
 
 	newtab := fileMenu.AddAction("New Tab")
@@ -98,7 +98,7 @@ func NewAppWindow() *AppWindow {
 
 	// Main widgets
 
-	ret.tabs = qt.NewQTabWidget2(ret.w.QWidget)
+	ret.tabs = qt.NewQTabWidget(ret.w.QWidget)
 	ret.tabs.SetTabsClosable(true)
 	ret.tabs.OnTabCloseRequested(func(index int) {
 		ret.handleTabClose(index)