diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 909198ac6..29216a0a1 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -5516,11 +5516,11 @@ class XmlForm
         'suggest'           => XmlForm_Field_Suggest::class,
         'text'              => XmlForm_Field_Text::class,
         'textarea'          => XmlForm_Field_Textarea::class,
-        'textareapm'        => XmlForm_Field_TextareaPM::class,
-        'textpm'            => XmlForm_Field_TextPM::class,
+        'textareapm'        => XmlFormFieldTextareaPM::class,
+        'textpm'            => XmlFormFieldTextPM::class,
         'title'             => XmlForm_Field_Title::class,
-        'toolbar'           => XmlForm_Field_ToolBar::class,
-        'toolbutton'        => XmlForm_Field_toolButton::class,
+        'toolbar'           => XmlFormFieldToolBar::class,
+        'toolbutton'        => XmlFormFieldtoolButton::class,
         'wysiwyg_editor'    => XmlForm_Field_WYSIWYG_EDITOR::class,
         'xmlform'           => XmlForm_Field_Xmlform::class,
         'xmlmenu'           => XmlForm_Field_XmlMenu::class,