diff --git a/qtinterface/tqt-replace b/qtinterface/tqt-replace
index e0b9e2b..a1ed332 100755
--- a/qtinterface/tqt-replace
+++ b/qtinterface/tqt-replace
@@ -5,7 +5,8 @@ if [[ $1 == "" ]]; then
 	echo "Usage: tqt-replace <input_file>"
 else
 	if [[ $QT_VER == 3 ]]; then
-		sed -i 's/TQ\([^T_]\)/Q\1/g' "$1"
+		sed -i 's/^TQ\([^T_]\)/Q\1/g' "$1"
+		sed -i 's/[^_]TQ\([^T_]\)/Q\1/g' "$1"
 		sed -i 's/TQT\([^_]\)/QT\1/g' "$1"
 		sed -i 's/Q_SLOTS>/slots>/g' "$1"
 		sed -i 's/Q_SIGNALS>/signals>/g' "$1"
diff --git a/qtinterface/tqt-replace-stream b/qtinterface/tqt-replace-stream
index ea20373..1b670c1 100755
--- a/qtinterface/tqt-replace-stream
+++ b/qtinterface/tqt-replace-stream
@@ -6,7 +6,8 @@ if [[ $1 == "" ]]; then
 else
 	if [[ $QT_VER == 3 ]]; then
 		cat $1 | \
-		sed 's/TQ\([^T_]\)/Q\1/g' | \
+		sed 's/^TQ\([^T_]\)/Q\1/g' | \
+		sed 's/[^_]TQ\([^T_]\)/Q\1/g' | \
 		sed 's/TQT\([^_]\)/QT\1/g' | \
 		sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g'
 	fi
diff --git a/qtinterface/tqt-replace-stream.cmake b/qtinterface/tqt-replace-stream.cmake
index 076c625..2ff69ec 100755
--- a/qtinterface/tqt-replace-stream.cmake
+++ b/qtinterface/tqt-replace-stream.cmake
@@ -6,7 +6,8 @@ if [[ $1 == "" ]]; then
 else
 	if [[ $QT_VERSION == 3 ]]; then
 		cat $1 | \
-		sed 's/TQ\([^T_]\)/Q\1/g' | \
+		sed 's/^TQ\([^T_]\)/Q\1/g' | \
+		sed 's/[^_]TQ\([^T_]\)/Q\1/g' | \
 		sed 's/TQT\([^_]\)/QT\1/g' | \
 		sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g'
 	fi
diff --git a/qtinterface/tqt-replace.cmake b/qtinterface/tqt-replace.cmake
index 704826f..1542ce4 100755
--- a/qtinterface/tqt-replace.cmake
+++ b/qtinterface/tqt-replace.cmake
@@ -5,7 +5,8 @@ if [[ $1 == "" ]]; then
 	echo "Usage: tqt-replace <input_file>"
 else
 	if [[ $QT_VERSION == 3 ]]; then
-		sed -i 's/TQ\([^T_]\)/Q\1/g' "$1"
+		sed -i 's/^TQ\([^T_]\)/Q\1/g' "$1"
+		sed -i 's/[^_]TQ\([^T_]\)/Q\1/g' "$1"
 		sed -i 's/TQT\([^_]\)/QT\1/g' "$1"
 		sed -i 's/Q_SLOTS>/slots>/g' "$1"
 		sed -i 's/Q_SIGNALS>/signals>/g' "$1"