6 files changed, 12 insertions, 11 deletions
diff --git a/src/imports/scxmlstatemachine/plugins.qmltypes b/src/imports/scxmlstatemachine/plugins.qmltypes
index 19b4acb..bc452d6 100644
--- a/src/imports/scxmlstatemachine/plugins.qmltypes
+++ b/src/imports/scxmlstatemachine/plugins.qmltypes
@@ -4,14 +4,14 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Scxml 1.0'
+// 'qmlplugindump -nonrelocatable QtScxml 1.0'
 
 Module {
     dependencies: ["QtQuick 2.0"]
     Component {
         name: "QScxmlStateMachineLoader"
         prototype: "QObject"
-        exports: ["Scxml/StateMachineLoader 1.0"]
+        exports: ["QtScxml/StateMachineLoader 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "filename"; type: "QUrl" }
         Property { name: "stateMachine"; type: "QScxmlStateMachine"; isReadonly: true; isPointer: true }
diff --git a/src/imports/scxmlstatemachine/qmldir b/src/imports/scxmlstatemachine/qmldir
index a411f70..e1fd0ee 100644
--- a/src/imports/scxmlstatemachine/qmldir
+++ b/src/imports/scxmlstatemachine/qmldir
@@ -1,4 +1,5 @@
-module Scxml
-plugin scxmlstatemachine
-classname ScxmlStateMachinePlugin
+module QtScxml
+plugin declarative_scxmlstatemachine
+classname QScxmlStateMachinePlugin
+typeinfo plugins.qmltypes
 
diff --git a/src/imports/scxmlstatemachine/scxmlstatemachine.pro b/src/imports/scxmlstatemachine/scxmlstatemachine.pro
index 5aa317c..c178157 100644
--- a/src/imports/scxmlstatemachine/scxmlstatemachine.pro
+++ b/src/imports/scxmlstatemachine/scxmlstatemachine.pro
@@ -1,6 +1,4 @@
-CXX_MODULE = qml
-TARGET = scxmlstatemachine
-TARGETPATH = Scxml
+TARGETPATH = QtScxml
 IMPORT_VERSION = 1.0
 
 QT = scxml qml-private core-private
@@ -13,3 +11,5 @@ HEADERS = \
     $$PWD/statemachineloader.h
 
 load(qml_plugin)
+
+OTHER_FILES += plugins.qmltypes qmldir
diff --git a/src/scxml/doc/qtscxml-index.qdoc b/src/scxml/doc/qtscxml-index.qdoc
index 42ad9a4..4f2fd7b 100644
--- a/src/scxml/doc/qtscxml-index.qdoc
+++ b/src/scxml/doc/qtscxml-index.qdoc
@@ -52,7 +52,7 @@
     in your .qml file:
 
     \code
-    import Scxml 1.0
+    import QtScxml 1.0
     \endcode
 
     To link against the module, add this line to your qmake .pro file:
diff --git a/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc b/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc
index fefa218..755e3ac 100644
--- a/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc
+++ b/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc
@@ -43,7 +43,7 @@
     Or, in QML:
 
     \qml
-    import Scxml 1.0
+    import QtScxml 1.0
 
     Item {
         property QtObject stateMachine: scxmlLoader.stateMachine
diff --git a/src/scxml/doc/qtscxml-module-qml.qdoc b/src/scxml/doc/qtscxml-module-qml.qdoc
index 3f3c4ad..5510c2c 100644
--- a/src/scxml/doc/qtscxml-module-qml.qdoc
+++ b/src/scxml/doc/qtscxml-module-qml.qdoc
@@ -35,7 +35,7 @@
     in your .qml file:
 
     \code
-    import Scxml 1.0
+    import QtScxml 1.0
     \endcode
 
     For more information, see \l{Instantiating State Machines}.