QT name cleanup
QT name cleanup