diff --git a/lib/Diagram.d.ts b/lib/Diagram.d.ts
index 94d590ec1..368a7cb3d 100644
--- a/lib/Diagram.d.ts
+++ b/lib/Diagram.d.ts
@@ -50,6 +50,7 @@ export default class Diagram<ServiceMap = null> {
   constructor(options?: DiagramOptions, injector?: Injector<ServiceMap>);
 
   /**
+   *
    * Resolves a diagram service.
    *
    *
@@ -84,7 +85,6 @@ export default class Diagram<ServiceMap = null> {
   get<T>(name: string, strict: true): T;
 
   /**
-   *
    * Resolves a diagram service.
    *
    *
@@ -95,6 +95,7 @@ export default class Diagram<ServiceMap = null> {
   get<T>(name: string): T;
 
   /**
+   *
    * Invoke the given function, injecting dependencies provided in
    * array notation. Return the result.
    *
@@ -108,7 +109,6 @@ export default class Diagram<ServiceMap = null> {
   invoke<T>(func: ArrayFunc<T>, context?: InjectionContext, locals?: LocalsMap): T;
 
   /**
-   *
    * Invoke the given function, injecting dependencies. Return the result.
    *
    *
diff --git a/lib/core/ElementFactory.d.ts b/lib/core/ElementFactory.d.ts
index 09ab6abde..473a29ee2 100644
--- a/lib/core/ElementFactory.d.ts
+++ b/lib/core/ElementFactory.d.ts
@@ -40,40 +40,40 @@ export default class ElementFactory<T extends import("../model/Types").Connectio
   createConnection(attrs?: Partial<Connection>): T;
 
   /**
-   * Create a label.
+   * Create a root element.
    *
    * @param type
    * @param attrs
    * @return
    */
-  create(type: 'label', attrs?: Partial<Label>): U;
+  create(type: 'root', attrs?: Partial<Root>): V;
 
   /**
-   * Create a connection.
+   * Create a shape.
    *
    * @param type
    * @param attrs
    * @return
    */
-  create(type: 'connection', attrs?: Partial<Connection>): T;
+  create(type: 'shape', attrs?: Partial<Shape>): W;
 
   /**
-   * Create a shape.
+   * Create a connection.
    *
    * @param type
    * @param attrs
    * @return
    */
-  create(type: 'shape', attrs?: Partial<Shape>): W;
+  create(type: 'connection', attrs?: Partial<Connection>): T;
 
   /**
-   * Create a root element.
+   * Create a label.
    *
    * @param type
    * @param attrs
    * @return
    */
-  create(type: 'root', attrs?: Partial<Root>): V;
+  create(type: 'label', attrs?: Partial<Label>): U;
 }
 
 type Element = import('../model/Types').Element;
diff --git a/lib/core/EventBus.d.ts b/lib/core/EventBus.d.ts
index 33fd529b0..60fd7f1ed 100644
--- a/lib/core/EventBus.d.ts
+++ b/lib/core/EventBus.d.ts
@@ -84,6 +84,7 @@
  */
 export default class EventBus<EventMap = null> {
   /**
+   *
    * Register an event listener for events with the given name.
    *
    * The callback will be invoked with `event, ...additionalArguments`
@@ -107,6 +108,7 @@ export default class EventBus<EventMap = null> {
   ): void;
 
   /**
+   *
    * Register an event listener for events with the given name.
    *
    * The callback will be invoked with `event, ...additionalArguments`
@@ -132,7 +134,6 @@ export default class EventBus<EventMap = null> {
   ): void;
 
   /**
-   *
    * Register an event listener for events with the given name.
    *
    * The callback will be invoked with `event, ...additionalArguments`
@@ -152,7 +153,6 @@ export default class EventBus<EventMap = null> {
   on<T>(events: string|string[], callback: EventBusEventCallback<T>, that?: any): void;
 
   /**
-   *
    * Register an event listener for events with the given name.
    *
    * The callback will be invoked with `event, ...additionalArguments`
@@ -178,6 +178,7 @@ export default class EventBus<EventMap = null> {
   ): void;
 
   /**
+   *
    * Register an event listener that is called only once.
    *
    *
@@ -192,6 +193,7 @@ export default class EventBus<EventMap = null> {
   ): void;
 
   /**
+   *
    * Register an event listener that is called only once.
    *
    *
@@ -208,7 +210,6 @@ export default class EventBus<EventMap = null> {
   ): void;
 
   /**
-   *
    * Register an event listener that is called only once.
    *
    *
@@ -219,7 +220,6 @@ export default class EventBus<EventMap = null> {
   once<T>(events: string|string[], callback: EventBusEventCallback<T>, that?: any): void;
 
   /**
-   *
    * Register an event listener that is called only once.
    *
    *
diff --git a/lib/features/context-pad/ContextPad.d.ts b/lib/features/context-pad/ContextPad.d.ts
index 871da9562..cdf572a31 100644
--- a/lib/features/context-pad/ContextPad.d.ts
+++ b/lib/features/context-pad/ContextPad.d.ts
@@ -15,22 +15,22 @@ export default class ContextPad {
   constructor(canvas: Canvas, elementRegistry: ElementRegistry, eventBus: EventBus, scheduler: any);
 
   /**
-   * Register a context pad provider with the given priority. See
+   *
+   * Register a context pad provider with the default priority. See
    * {@link ContextPadProvider} for examples.
    *
-   * @param priority
    * @param provider
    */
-  registerProvider(priority: number, provider: ContextPadProvider): void;
+  registerProvider(provider: ContextPadProvider): void;
 
   /**
-   *
-   * Register a context pad provider with the default priority. See
+   * Register a context pad provider with the given priority. See
    * {@link ContextPadProvider} for examples.
    *
+   * @param priority
    * @param provider
    */
-  registerProvider(provider: ContextPadProvider): void;
+  registerProvider(priority: number, provider: ContextPadProvider): void;
 
   /**
    * Get context pad entries for given elements.
diff --git a/lib/features/keyboard/Keyboard.d.ts b/lib/features/keyboard/Keyboard.d.ts
index 4eb20022a..9dda27615 100644
--- a/lib/features/keyboard/Keyboard.d.ts
+++ b/lib/features/keyboard/Keyboard.d.ts
@@ -32,6 +32,7 @@ export default class Keyboard {
   }, eventBus: EventBus);
 
   /**
+   *
    * Bind keyboard events to the canvas node.
    */
   bind(): void;
diff --git a/lib/features/modeling/Modeling.d.ts b/lib/features/modeling/Modeling.d.ts
index a3aa7ddf8..b772df110 100644
--- a/lib/features/modeling/Modeling.d.ts
+++ b/lib/features/modeling/Modeling.d.ts
@@ -78,9 +78,9 @@ export default class Modeling<T extends import("../../model/Types").Connection =
   /**
    * Create a connection.
    *
+   *
    * @param source
    * @param target
-   * @param parentIndex
    * @param connection
    * @param parent
    * @param hints
@@ -90,7 +90,6 @@ export default class Modeling<T extends import("../../model/Types").Connection =
   createConnection(
     source: U,
     target: U,
-    parentIndex: number,
     connection: Partial<T>,
     parent: W,
     hints?: ModelingHints
@@ -99,9 +98,9 @@ export default class Modeling<T extends import("../../model/Types").Connection =
   /**
    * Create a connection.
    *
-   *
    * @param source
    * @param target
+   * @param parentIndex
    * @param connection
    * @param parent
    * @param hints
@@ -111,6 +110,7 @@ export default class Modeling<T extends import("../../model/Types").Connection =
   createConnection(
     source: U,
     target: U,
+    parentIndex: number,
     connection: Partial<T>,
     parent: W,
     hints?: ModelingHints
@@ -119,10 +119,10 @@ export default class Modeling<T extends import("../../model/Types").Connection =
   /**
    * Create a shape.
    *
+   *
    * @param shape
    * @param position
    * @param target
-   * @param parentIndex
    * @param hints
    *
    * @return
@@ -131,17 +131,16 @@ export default class Modeling<T extends import("../../model/Types").Connection =
     shape: Partial<X>,
     position: Point,
     target: W,
-    parentIndex: number,
     hints?: ModelingCreateShapeHints
   ): X;
 
   /**
    * Create a shape.
    *
-   *
    * @param shape
    * @param position
    * @param target
+   * @param parentIndex
    * @param hints
    *
    * @return
@@ -150,6 +149,7 @@ export default class Modeling<T extends import("../../model/Types").Connection =
     shape: Partial<X>,
     position: Point,
     target: W,
+    parentIndex: number,
     hints?: ModelingCreateShapeHints
   ): X;
 
diff --git a/lib/features/palette/Palette.d.ts b/lib/features/palette/Palette.d.ts
index 7e492a66b..b53ef5646 100644
--- a/lib/features/palette/Palette.d.ts
+++ b/lib/features/palette/Palette.d.ts
@@ -13,22 +13,22 @@ export default class Palette {
   constructor(eventBus: EventBus, canvas: Canvas);
 
   /**
-   * Register a palette provider with the given priority. See
+   *
+   * Register a palette provider with default priority. See
    * {@link PaletteProvider} for examples.
    *
-   * @param priority
    * @param provider
    */
-  registerProvider(priority: number, provider: PaletteProvider): void;
+  registerProvider(provider: PaletteProvider): void;
 
   /**
-   *
-   * Register a palette provider with default priority. See
+   * Register a palette provider with the given priority. See
    * {@link PaletteProvider} for examples.
    *
+   * @param priority
    * @param provider
    */
-  registerProvider(provider: PaletteProvider): void;
+  registerProvider(priority: number, provider: PaletteProvider): void;
 
   /**
    * Returns the palette entries.
diff --git a/lib/features/popup-menu/PopupMenu.d.ts b/lib/features/popup-menu/PopupMenu.d.ts
index 00cddf4f5..25dfda6c9 100644
--- a/lib/features/popup-menu/PopupMenu.d.ts
+++ b/lib/features/popup-menu/PopupMenu.d.ts
@@ -43,24 +43,24 @@ export default class PopupMenu {
   isEmpty(target: PopupMenuTarget, providerId: string): boolean;
 
   /**
-   * Register a popup menu provider with the given priority. See
+   *
+   * Register a popup menu provider with default priority. See
    * {@link PopupMenuProvider} for examples.
    *
    * @param id
-   * @param priority
    * @param provider
    */
-  registerProvider(id: string, priority: number, provider: PopupMenuProvider): void;
+  registerProvider(id: string, provider: PopupMenuProvider): void;
 
   /**
-   *
-   * Register a popup menu provider with default priority. See
+   * Register a popup menu provider with the given priority. See
    * {@link PopupMenuProvider} for examples.
    *
    * @param id
+   * @param priority
    * @param provider
    */
-  registerProvider(id: string, provider: PopupMenuProvider): void;
+  registerProvider(id: string, priority: number, provider: PopupMenuProvider): void;
 
   /**
    * Check if the popup menu is open.
diff --git a/lib/model/index.d.ts b/lib/model/index.d.ts
index 20c61e783..bc18bbfc2 100644
--- a/lib/model/index.d.ts
+++ b/lib/model/index.d.ts
@@ -1,17 +1,17 @@
 /**
- * Creates a label.
+ * Creates a root element.
+ *
  *
  * @example
  *
  * ```javascript
  * import * as Model from 'diagram-js/lib/model';
  *
- * const label = Model.create('label', {
+ * const root = Model.create('root', {
  *   x: 100,
  *   y: 100,
  *   width: 100,
- *   height: 100,
- *   labelTarget: shape
+ *   height: 100
  * });
  * ```
  *
@@ -20,10 +20,10 @@
  *
  * @return
  */
-export function create(type: 'label', attrs?: Object): Label;
+export function create(type: 'root', attrs?: any): Root;
 
 /**
- * Creates a shape.
+ * Creates a connection.
  *
  *
  * @example
@@ -31,11 +31,11 @@ export function create(type: 'label', attrs?: Object): Label;
  * ```javascript
  * import * as Model from 'diagram-js/lib/model';
  *
- * const shape = Model.create('shape', {
- *   x: 100,
- *   y: 100,
- *   width: 100,
- *   height: 100
+ * const connection = Model.create('connection', {
+ *   waypoints: [
+ *     { x: 100, y: 100 },
+ *     { x: 200, y: 100 }
+ *   ]
  * });
  * ```
  *
@@ -44,10 +44,10 @@ export function create(type: 'label', attrs?: Object): Label;
  *
  * @return
  */
-export function create(type: 'shape', attrs?: any): Shape;
+export function create(type: 'connection', attrs?: any): Connection;
 
 /**
- * Creates a connection.
+ * Creates a shape.
  *
  *
  * @example
@@ -55,11 +55,11 @@ export function create(type: 'shape', attrs?: any): Shape;
  * ```javascript
  * import * as Model from 'diagram-js/lib/model';
  *
- * const connection = Model.create('connection', {
- *   waypoints: [
- *     { x: 100, y: 100 },
- *     { x: 200, y: 100 }
- *   ]
+ * const shape = Model.create('shape', {
+ *   x: 100,
+ *   y: 100,
+ *   width: 100,
+ *   height: 100
  * });
  * ```
  *
@@ -68,22 +68,22 @@ export function create(type: 'shape', attrs?: any): Shape;
  *
  * @return
  */
-export function create(type: 'connection', attrs?: any): Connection;
+export function create(type: 'shape', attrs?: any): Shape;
 
 /**
- * Creates a root element.
- *
+ * Creates a label.
  *
  * @example
  *
  * ```javascript
  * import * as Model from 'diagram-js/lib/model';
  *
- * const root = Model.create('root', {
+ * const label = Model.create('label', {
  *   x: 100,
  *   y: 100,
  *   width: 100,
- *   height: 100
+ *   height: 100,
+ *   labelTarget: shape
  * });
  * ```
  *
@@ -92,7 +92,7 @@ export function create(type: 'connection', attrs?: any): Connection;
  *
  * @return
  */
-export function create(type: 'root', attrs?: any): Root;
+export function create(type: 'label', attrs?: Object): Label;
 
 /**
  * Checks whether an object is a model instance.