diff --git a/includes/XtoolsBlueprintInfo.inc b/includes/XtoolsBlueprintInfo.inc
deleted file mode 100644
index 8e25dd9..0000000
--- a/includes/XtoolsBlueprintInfo.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Represents any blueprint defined in a hook_xtools_blueprint_info() hook
- * implementation. Use this when you cannot get a blueprint through
- * xtools_blueprint_info().
- */
-class XtoolsBlueprintInfo implements XtoolsBlueprintInterface {
-
-  /**
-   * The blueprint's machine name as defined in hook_xtools_blueprint_info().
-   *
-   * @var string
-   */
-  public $blueprint_name = '';
-
-  function __construct($blueprint_name) {
-    $this->blueprint_name = $blueprint_name;
-  }
-
-  /**
-   * Implements XtoolsBlueprint::getLabel().
-   */
-  function getLabel() {
-    return xtools_blueprint_info($this->blueprint_name)->getLabel();
-  }
-
-  /**
-   * Implements XtoolsBlueprint::validate().
-   */
-  function validate($data, array &$asserts, $path) {
-    return xtools_blueprint_info($this->blueprint_name)->validate($data, $asserts, $path);
-  }
-}
\ No newline at end of file
diff --git a/includes/XtoolsBlueprintPlaceholder.inc b/includes/XtoolsBlueprintPlaceholder.inc
new file mode 100644
index 0000000..905c4a2
--- /dev/null
+++ b/includes/XtoolsBlueprintPlaceholder.inc
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Represents any blueprint defined in a hook_xtools_blueprint_info() hook
+ * implementation. Use this when you cannot get a blueprint through
+ * xtools_blueprint_info().
+ */
+class XtoolsBlueprintPlaceholder implements XtoolsBlueprintInterface {
+
+  /**
+   * The blueprint's machine name as defined in hook_xtools_blueprint_info().
+   *
+   * @var string
+   */
+  public $blueprint_name = '';
+
+  function __construct($blueprint_name) {
+    $this->blueprint_name = $blueprint_name;
+  }
+
+  /**
+   * Implements XtoolsBlueprint::getLabel().
+   */
+  function getLabel() {
+    return xtools_blueprint_info($this->blueprint_name)->getLabel();
+  }
+
+  /**
+   * Implements XtoolsBlueprint::validate().
+   */
+  function validate($data, array &$asserts, $path) {
+    return xtools_blueprint_info($this->blueprint_name)->validate($data, $asserts, $path);
+  }
+}
\ No newline at end of file
diff --git a/includes/XtoolsCallableType.inc b/includes/XtoolsCallableType.inc
index 8a05e80..c039bc1 100644
--- a/includes/XtoolsCallableType.inc
+++ b/includes/XtoolsCallableType.inc
@@ -12,7 +12,7 @@ abstract class XtoolsCallableType {
   public $argument_groups = array(array());
 
   /**
-   * This callable's blueprint. Use XtoolsBlueprintInfo to refer to a signature
+   * This callable's blueprint. Use XtoolsBlueprintPlaceholder to refer to a signature
    * specified in a hook_xtools_blueprint_info() implementation.
    *
    * @var string
@@ -29,7 +29,7 @@ abstract class XtoolsCallableType {
    public $module = NULL;
 
   /**
-   * This callable's signature. Use XtoolsSignatureInfo to refer to a signature
+   * This callable's signature. Use XtoolsSignaturePlaceholder to refer to a signature
    * specified in a hook_xtools_signature_info() implementation.
    *
    * @var XtoolsSignature
diff --git a/includes/XtoolsSignatureInfo.inc b/includes/XtoolsSignatureInfo.inc
deleted file mode 100644
index c432ab8..0000000
--- a/includes/XtoolsSignatureInfo.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Represents any signature defined in a hook_xtools_signature_info() hook
- * implementation. Use this when you cannot get a signature through
- * xtools_signature_info().
- */
-class XtoolsSignatureInfo extends XtoolsSignature {
-
-  /**
-   * The machine name of the represented signature.
-   *
-   * @var string
-   */
-  public $signature_name = NULL;
-
-  /**
-   * Constructor.
-   *
-   * @param string $signature_name
-   *   The machine name of the signature as defined in a
-   *   hook_xtools_signature_info() implementation.
-   */
-  function __construct($signature_name) {
-    $this->signature_name = $signature_name;
-  }
-
-  /**
-   * Implements XtoolsSignature::validate().
-   */
-  function validate($callable, array &$asserts = array()) {
-    $signature = xtools_signature_info($this->signature_name);
-
-    return $signature->validate($callable, $asserts);
-  }
-}
\ No newline at end of file
diff --git a/includes/XtoolsSignaturePlaceholder.inc b/includes/XtoolsSignaturePlaceholder.inc
new file mode 100644
index 0000000..1805290
--- /dev/null
+++ b/includes/XtoolsSignaturePlaceholder.inc
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Represents any signature defined in a hook_xtools_signature_info() hook
+ * implementation. Use this when you cannot get a signature through
+ * xtools_signature_info().
+ */
+class XtoolsSignaturePlaceholder extends XtoolsSignature {
+
+  /**
+   * The machine name of the represented signature.
+   *
+   * @var string
+   */
+  public $signature_name = NULL;
+
+  /**
+   * Constructor.
+   *
+   * @param string $signature_name
+   *   The machine name of the signature as defined in a
+   *   hook_xtools_signature_info() implementation.
+   */
+  function __construct($signature_name) {
+    $this->signature_name = $signature_name;
+  }
+
+  /**
+   * Implements XtoolsSignature::validate().
+   */
+  function validate($callable, array &$asserts = array()) {
+    $signature = xtools_signature_info($this->signature_name);
+
+    return $signature->validate($callable, $asserts);
+  }
+}
\ No newline at end of file
diff --git a/xtools.api.php b/xtools.api.php
index c8573e0..9159da9 100644
--- a/xtools.api.php
+++ b/xtools.api.php
@@ -58,11 +58,11 @@ function hook_xtools_callable_type_info() {
       )),
     )),
     new XtoolsCallableType('hook_foo_action_bar', array(
-      'signature' => new XtoolsSignatureInfo('hook_foo_action_bar'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_foo_action_bar'),
     )),
     new XtoolsCallableType('hook_foo_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_foo_info'),
-      'signature' => new XtoolsSignatureInfo('hook_foo_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_foo_info'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_foo_info'),
     )),
   );
 }
diff --git a/xtools.info b/xtools.info
index 218dacb..e726b1e 100644
--- a/xtools.info
+++ b/xtools.info
@@ -6,7 +6,7 @@ files[] = includes/XtoolsBlueprintArray.inc
 files[] = includes/XtoolsBlueprintBoolean.inc
 files[] = includes/XtoolsBlueprintChildElement.inc
 files[] = includes/XtoolsBlueprintFloat.inc
-files[] = includes/XtoolsBlueprintInfo.inc
+files[] = includes/XtoolsBlueprintPlaceholder.inc
 files[] = includes/XtoolsBlueprintInteger.inc
 files[] = includes/XtoolsBlueprintInterface.inc
 files[] = includes/XtoolsBlueprintNULL.inc
@@ -22,6 +22,6 @@ files[] = includes/XtoolsCallableTypeHook.inc
 files[] = includes/XtoolsCallableTypeHookElementInfoCallbacks.inc
 files[] = includes/XtoolsCallableTypeHookViews.inc
 files[] = includes/XtoolsSignature.inc
-files[] = includes/XtoolsSignatureInfo.inc
+files[] = includes/XtoolsSignaturePlaceholder.inc
 files[] = includes/XtoolsSignatureParameter.inc
 files[] = tests/XtoolsWebTestCase.test
\ No newline at end of file
diff --git a/xtools.module b/xtools.module
index 5567668..655e5cf 100644
--- a/xtools.module
+++ b/xtools.module
@@ -40,12 +40,12 @@ function xtools_blueprints_info() {
  * If you the desired blueprint is unable when setting it somewhere, but it
  * will be upon validation (when nesting blueprints in a
  * hook_xtools_blueprint_info() implementation, for instance), use
- * XtoolsBlueprintInfo instead. The following example demonstrates the two ways
+ * XtoolsBlueprintPlaceholder instead. The following example demonstrates the two ways
  * to get a blueprint. They are functionally identical, but only the object
  * approach will work if the blueprint is unavailable when setting it.
  * @code
  * $blueprint = xtools_blueprint_info('blueprint_name);
- * $blueprint = new XtoolsBlueprintInfo('blueprint_name);
+ * $blueprint = new XtoolsBlueprintPlaceholder('blueprint_name);
  * @endcode
  *
  * @param string $name
@@ -109,14 +109,14 @@ function xtools_signatures_info() {
 /**
  * Return a callable signature.
  *
- * @see XtoolsSignatureInfo
+ * @see XtoolsSignaturePlaceholder
  *
  * The following example demonstrates the two ways to get a signature. They are
  * functionally identical, but only the object approach will work if the
  * signature is unavailable when setting it.
  * @code
  * $signature = xtools_signature_info('signature_name');
- * $signature = new XtoolsSignatureInfo('signature_name');
+ * $signature = new XtoolsSignaturePlaceholder('signature_name');
  * @endcode
  *
  * @param string $signature_name
diff --git a/xtools.xtools.inc b/xtools.xtools.inc
index 57cfefe..5034af6 100644
--- a/xtools.xtools.inc
+++ b/xtools.xtools.inc
@@ -537,12 +537,12 @@ function xtools_xtools_blueprint_info() {
 
   // hook_xtools_callable_type_info() return value.
   $blueprints['hook_xtools_callable_type_info'] = new XtoolsBlueprintArray(array(), array(
-    new XtoolsBlueprintInfo('XtoolsCallableType'),
+    new XtoolsBlueprintPlaceholder('XtoolsCallableType'),
   ), 'integer');
 
   // hook_xtools_blueprint_info() return value.
   $blueprints['hook_xtools_blueprint_info'] = new XtoolsBlueprintArray(array(), array(
-    new XtoolsBlueprintInfo('XtoolsBlueprint'),
+    new XtoolsBlueprintPlaceholder('XtoolsBlueprint'),
   ), 'string');
 
   // Class XtoolsBlueprint.
@@ -550,9 +550,9 @@ function xtools_xtools_blueprint_info() {
   // keep the "XtoolsBlueprintInterface" as the last item in the array.
   $blueprints['XtoolsBlueprint'] = new XtoolsBlueprintOr(array(
     // Test a few specific blueprint types first.
-    new XtoolsBlueprintInfo('XtoolsBlueprintArray'),
-    new XtoolsBlueprintInfo('XtoolsBlueprintObject'),
-    new XtoolsBlueprintInfo('XtoolsBlueprintPrimitive'),
+    new XtoolsBlueprintPlaceholder('XtoolsBlueprintArray'),
+    new XtoolsBlueprintPlaceholder('XtoolsBlueprintObject'),
+    new XtoolsBlueprintPlaceholder('XtoolsBlueprintPrimitive'),
     // At the very least, blueprints should implement XtoolsBlueprintInterface.
     new XtoolsBlueprintObject('XtoolsBlueprintInterface'),
   ));
@@ -560,15 +560,15 @@ function xtools_xtools_blueprint_info() {
   // Class XtoolsBlueprintArray.
   $blueprints['XtoolsBlueprintArray'] = new XtoolsBlueprintObject('XtoolsBlueprintArray', array(
     'blueprints_named' => new XtoolsBlueprintChildElement(new XtoolsBlueprintArray(array(), array(
-      new XtoolsBlueprintInfo('XtoolsBlueprintChildElement'),
+      new XtoolsBlueprintPlaceholder('XtoolsBlueprintChildElement'),
     ))),
     'key_type' => new XtoolsBlueprintChildElement(new XtoolsBlueprintOrValue(array('integer', 'string', NULL)), TRUE),
-    'or' => new XtoolsBlueprintChildElement(new XtoolsBlueprintInfo('XtoolsBlueprintOr')),
+    'or' => new XtoolsBlueprintChildElement(new XtoolsBlueprintPlaceholder('XtoolsBlueprintOr')),
   ));
 
   // Class XtoolsBlueprintChildElement.
   $blueprints['XtoolsBlueprintChildElement'] = new XtoolsBlueprintObject('XtoolsBlueprintChildElement', array(
-    'child_blueprint' => new XtoolsBlueprintChildElement(new XtoolsBlueprintInfo('XtoolsBlueprint'), TRUE),
+    'child_blueprint' => new XtoolsBlueprintChildElement(new XtoolsBlueprintPlaceholder('XtoolsBlueprint'), TRUE),
     'required' => new XtoolsBlueprintChildElement(new XtoolsBlueprintBoolean),
   ));
 
@@ -576,14 +576,14 @@ function xtools_xtools_blueprint_info() {
   $blueprints['XtoolsBlueprintObject'] = new XtoolsBlueprintObject('XtoolsBlueprintObject', array(
     'instanceof' => new XtoolsBlueprintChildElement(new XtoolsBlueprintString, TRUE),
     'object_properties' => new XtoolsBlueprintChildElement(new XtoolsBlueprintArray(array(), array(
-      new XtoolsBlueprintChildElement(new XtoolsBlueprintInfo('XtoolsBlueprintChildElement')),
+      new XtoolsBlueprintChildElement(new XtoolsBlueprintPlaceholder('XtoolsBlueprintChildElement')),
     ), 'string'), TRUE),
   ));
 
   // Class XtoolsBlueprintOr.
   $blueprints['XtoolsBlueprintOr'] = new XtoolsBlueprintObject('XtoolsBlueprintOr', array(
     'allowed_blueprints' => new XtoolsBlueprintChildElement(new XtoolsBlueprintArray(array(), array(
-      new XtoolsBlueprintChildElement(new XtoolsBlueprintInfo('XtoolsBlueprint')),
+      new XtoolsBlueprintChildElement(new XtoolsBlueprintPlaceholder('XtoolsBlueprint')),
     ), 'integer'), TRUE),
   ));
 
@@ -594,15 +594,15 @@ function xtools_xtools_blueprint_info() {
 
   // Class XtoolsCallableType.
   $blueprints['XtoolsCallableType'] = new XtoolsBlueprintObject('XtoolsCallableType', array(
-    'blueprint' => new XtoolsBlueprintChildElement(new XtoolsBlueprintInfo('XtoolsBlueprint')),
+    'blueprint' => new XtoolsBlueprintChildElement(new XtoolsBlueprintPlaceholder('XtoolsBlueprint')),
     'module' => new XtoolsBlueprintChildElement(new XtoolsBlueprintString),
-    'signature' => new XtoolsBlueprintChildElement(new XtoolsBlueprintInfo('XtoolsSignature')),
+    'signature' => new XtoolsBlueprintChildElement(new XtoolsBlueprintPlaceholder('XtoolsSignature')),
   ));
 
   // Class XtoolsSignature.
   $blueprints['XtoolsSignature'] = new XtoolsBlueprintObject('XtoolsSignature', array(
     'parameters' => new XtoolsBlueprintChildElement(new XtoolsBlueprintArray(array(), array(
-      new XtoolsBlueprintInfo('XtoolsSignatureParameter'),
+      new XtoolsBlueprintPlaceholder('XtoolsSignatureParameter'),
     ), 'integer'), TRUE),
   ));
 
@@ -630,286 +630,286 @@ function xtools_xtools_callable_type_info() {
   return array(
     // hook_aggregator_fetch().
     new XtoolsCallableTypeHook('aggregator_fetch', array(
-      'signature' => new XtoolsSignatureInfo('hook_aggregator_fetch'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_aggregator_fetch'),
       'module' => 'aggregator',
     )),
 
     // hook_aggregator_fetch_info().
     new XtoolsCallableTypeHook('aggregator_fetch_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_aggregator_fetch_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_aggregator_fetch_info'),
       'module' => 'aggregator',
     )),
 
     // hook_aggregator_parse().
     new XtoolsCallableTypeHook('aggregator_parse', array(
-      'signature' => new XtoolsSignatureInfo('hook_aggregator_parse'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_aggregator_parse'),
       'module' => 'aggregator',
     )),
 
     // hook_aggregator_parse_info().
     new XtoolsCallableTypeHook('aggregator_parse_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_aggregator_parse_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_aggregator_parse_info'),
       'module' => 'aggregator',
     )),
 
     // hook_aggregator_process().
     new XtoolsCallableTypeHook('aggregator_process', array(
-      'signature' => new XtoolsSignatureInfo('hook_aggregator_process'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_aggregator_process'),
       'module' => 'aggregator',
     )),
 
     // hook_aggregator_process_info().
     new XtoolsCallableTypeHook('aggregator_process_info', array(
-      'signature' => new XtoolsSignatureInfo('hook_aggregator_process_info'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_aggregator_process_info'),
       'module' => 'aggregator',
     )),
 
     // hook_aggregator_remove().
     new XtoolsCallableTypeHook('aggregator_remove', array(
-      'signature' => new XtoolsSignatureInfo('hook_aggregator_remove'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_aggregator_remove'),
       'module' => 'aggregator',
     )),
 
     // hook_block_configure().
     new XtoolsCallableTypeHook('block_configure', array(
-      'signature' => new XtoolsSignatureInfo('hook_block_configure'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_block_configure'),
       'module' => 'block',
     )),
 
     // hook_block_info().
     new XtoolsCallableTypeHook('block_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_block_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_block_info'),
       'module' => 'block',
     )),
 
     // hook_block_info_alter().
     new XtoolsCallableTypeHook('block_info_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_block_info_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_block_info_alter'),
       'module' => 'block',
     )),
 
     // hook_block_list_alter().
     new XtoolsCallableTypeHook('block_list_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_block_list_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_block_list_alter'),
       'module' => 'block',
     )),
 
     // hook_block_save().
     new XtoolsCallableTypeHook('block_save', array(
-      'signature' => new XtoolsSignatureInfo('hook_block_save'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_block_save'),
       'module' => 'block',
     )),
 
     // hook_block_view().
     new XtoolsCallableTypeHook('block_view', array(
-      'signature' => new XtoolsSignatureInfo('hook_block_view'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_block_view'),
       'module' => 'block',
     )),
 
     // hook_block_view_alter().
     new XtoolsCallableTypeHook('block_view_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_block_view_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_block_view_alter'),
       'module' => 'block',
     )),
 
     // hook_comment_delete().
     new XtoolsCallableTypeHook('comment_delete', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_delete'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_delete'),
       'module' => 'comment',
     )),
 
     // hook_comment_insert().
     new XtoolsCallableTypeHook('comment_insert', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_insert'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_insert'),
       'module' => 'comment',
     )),
 
     // hook_comment_load().
     new XtoolsCallableTypeHook('comment_load', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_load'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_load'),
       'module' => 'comment',
     )),
 
     // hook_comment_presave().
     new XtoolsCallableTypeHook('comment_presave', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_presave'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_presave'),
       'module' => 'comment',
     )),
 
     // hook_comment_publish().
     new XtoolsCallableTypeHook('comment_publish', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_publish'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_publish'),
       'module' => 'comment',
     )),
 
     // hook_comment_unpublish().
     new XtoolsCallableTypeHook('comment_unpublish', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_unpublish'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_unpublish'),
       'module' => 'comment',
     )),
     // hook_comment_update().
     new XtoolsCallableTypeHook('comment_update', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_update'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_update'),
       'module' => 'comment',
     )),
     // hook_comment_view().
     new XtoolsCallableTypeHook('comment_view', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_view'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_view'),
       'module' => 'comment',
     )),
     // hook_comment_view_alter().
     new XtoolsCallableTypeHook('comment_view_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_comment_view_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_comment_view_alter'),
       'module' => 'comment',
     )),
 
     // hook_contextual_links_view_alter().
     new XtoolsCallableTypeHook('contextual_links_view_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_contextual_links_view_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_contextual_links_view_alter'),
       'module' => 'contextual',
     )),
 
     // hook_dashboard_regions().
     new XtoolsCallableTypeHook('dashboard_regions', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_dashboard_regions'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_dashboard_regions'),
       'module' => 'dashboard',
     )),
 
     // hook_dashboard_regions_alter().
     new XtoolsCallableTypeHook('dashboard_regions_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_dashboard_regions_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_dashboard_regions_alter'),
       'module' => 'dashboard',
     )),
 
     // hook_field_extra_fields().
     new XtoolsCallableTypeHook('field_extra_fields', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_field_extra_fields'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_field_extra_fields'),
       'module' => 'field',
     )),
 
     // hook_field_info().
     new XtoolsCallableTypeHook('field_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_field_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_field_info'),
       'module' => 'field',
     )),
 
     // hook_field_formatter_info().
     new XtoolsCallableTypeHook('field_formatter_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_field_formatter_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_field_formatter_info'),
       'module' => 'field',
     )),
 
     // hook_field_storage_info().
     new XtoolsCallableTypeHook('field_storage_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_field_storage_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_field_storage_info'),
       'module' => 'field',
     )),
 
     // hook_field_widget_info().
     new XtoolsCallableTypeHook('field_widget_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_field_widget_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_field_widget_info'),
       'module' => 'field',
     )),
 
     // hook_file_download_access().
     new XtoolsCallableTypeHook('file_download_access', array(
-      'signature' => new XtoolsSignatureInfo('hook_file_download_access'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_file_download_access'),
       'module' => 'file',
     )),
 
     // hook_file_download_access_alter().
     new XtoolsCallableTypeHook('file_download_access_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_file_download_access_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_file_download_access_alter'),
       'module' => 'file',
     )),
 
     // hook_node_info().
     new XtoolsCallableTypeHook('node_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_node_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_node_info'),
       'module' => 'node',
     )),
 
     // hook_node_operations().
     new XtoolsCallableTypeHook('node_operations', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_node_operations'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_node_operations'),
       'module' => 'node',
     )),
 
     // hook_ranking().
     new XtoolsCallableTypeHook('ranking', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_ranking'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_ranking'),
       'module' => 'node',
     )),
 
     // hook_admin_paths().
     new XtoolsCallableTypeHook('admin_paths', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_admin_paths'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_admin_paths'),
       'module' => 'system',
     )),
 
     // hook_cron_queue_info().
     new XtoolsCallableTypeHook('cron_queue_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_cron_queue_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_cron_queue_info'),
       'module' => 'system',
     )),
 
     // hook_element_info().
     new XtoolsCallableTypeHook('element_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_element_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_element_info'),
       'module' => 'system',
     )),
 
     // hook_element_info() callbacks.
     new XtoolsCallableTypeHookElementInfoCallbacks(array(
-      'signature' => new XtoolsSignatureInfo('hook_element_info_callback'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_element_info_callback'),
       'module' => 'system',
     )),
 
     // hook_entity_info().
     new XtoolsCallableTypeHook('entity_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_entity_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_entity_info'),
       'module' => 'system',
     )),
 
     // hook_forms().
     new XtoolsCallableTypeHook('forms', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_forms'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_forms'),
       'module' => 'system',
     )),
 
     // hook_flush_caches().
     new XtoolsCallableTypeHook('flush_caches', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_flush_caches'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_flush_caches'),
       'module' => 'system',
     )),
 
     // hook_hook_info().
     new XtoolsCallableTypeHook('hook_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_hook_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_hook_info'),
       'module' => 'system',
     )),
 
     // hook_image_toolkits().
     new XtoolsCallableTypeHook('image_toolkits', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_image_toolkits'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_image_toolkits'),
       'module' => 'system',
     )),
 
     // hook_library().
     new XtoolsCallableTypeHook('library', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_library'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_library'),
       'module' => 'system',
     )),
 
     // hook_menu().
     new XtoolsCallableTypeHook('menu', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_menu'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_menu'),
       'module' => 'system',
     )),
 
     // hook_permission().
     new XtoolsCallableTypeHook('permission', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_permission'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_permission'),
       'module' => 'system',
     )),
 
@@ -920,191 +920,191 @@ function xtools_xtools_callable_type_info() {
         array('update'),
         array('runtime'),
       ),
-      'blueprint' => new XtoolsBlueprintInfo('hook_requirements'),
-      'signature' => new XtoolsSignatureInfo('hook_requirements'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_requirements'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_requirements'),
       'module' => 'system',
     )),
 
     // hook_schema().
     new XtoolsCallableTypeHook('schema', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_schema'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_schema'),
       'module' => 'system',
     )),
 
     // hook_stream_wrappers().
     new XtoolsCallableTypeHook('stream_wrappers', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_stream_wrappers'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_stream_wrappers'),
       'module' => 'system',
     )),
 
     // hook_system_theme_info().
     new XtoolsCallableTypeHook('system_theme_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_system_theme_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_system_theme_info'),
       'module' => 'system',
     )),
 
     // hook_update_dependencies().
     new XtoolsCallableTypeHook('update_dependencies', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_update_dependencies'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_update_dependencies'),
       'module' => 'system',
     )),
 
     // hook_update_last_removed().
     new XtoolsCallableTypeHook('update_last_removed', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_update_last_removed'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_update_last_removed'),
       'module' => 'system',
     )),
 
     // hook_xmlrpc().
     new XtoolsCallableTypeHook('xmlrpc', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_xmlrpc'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_xmlrpc'),
       'module' => 'system',
     )),
 
     // hook_user_categories().
     new XtoolsCallableTypeHook('user_categories', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_user_categories'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_user_categories'),
       'module' => 'user',
     )),
 
     // hook_views_ajax_data_alter().
     new XtoolsCallableTypeHookViews('views_ajax_data_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_ajax_data_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_ajax_data_alter'),
       'module' => 'views',
     )),
 
     // hook_views_api().
     new XtoolsCallableTypeHook('views_api', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_views_api'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_views_api'),
       'module' => 'views',
     )),
 
     // hook_views_data().
     new XtoolsCallableTypeHookViews('views_data', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_views_data'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_views_data'),
       'module' => 'views',
     )),
 
     // hook_views_data_alter().
     new XtoolsCallableTypeHookViews('views_data_alter', array(
       'module' => 'views',
-      'signature' => new XtoolsSignatureInfo('hook_views_data_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_data_alter'),
     )),
 
     // hook_views_default_views().
     new XtoolsCallableTypeHookViews('views_default_views', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_views_default_views'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_views_default_views'),
       'module' => 'views',
     )),
 
     // hook_views_default_views_alter().
     new XtoolsCallableTypeHookViews('views_default_views_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_default_views_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_default_views_alter'),
       'module' => 'views',
     )),
 
     // hook_views_form_validate().
     new XtoolsCallableTypeHookViews('views_form_validate', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_form_valite'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_form_valite'),
       'module' => 'views',
     )),
 
     // hook_views_form_submit().
     new XtoolsCallableTypeHookViews('views_form_submit', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_form_submit'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_form_submit'),
       'module' => 'views',
     )),
 
     // hook_views_plugins().
     new XtoolsCallableTypeHookViews('views_plugins', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_views_plugins'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_views_plugins'),
       'module' => 'views',
     )),
 
     // hook_views_plugins_alter().
     new XtoolsCallableTypeHookViews('views_plugins_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_plugins_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_plugins_alter'),
       'module' => 'views',
     )),
 
     // hook_views_post_build().
     new XtoolsCallableTypeHookViews('views_post_build', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_post_build'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_post_build'),
       'module' => 'views',
     )),
 
     // hook_views_post_execute().
     new XtoolsCallableTypeHookViews('views_post_execute', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_pre_view'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_pre_view'),
       'module' => 'views',
     )),
 
     // hook_views_post_render().
     new XtoolsCallableTypeHookViews('views_post_render', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_post_render'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_post_render'),
       'module' => 'views',
     )),
 
     // hook_views_pre_build().
     new XtoolsCallableTypeHookViews('views_pre_build', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_pre_build'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_pre_build'),
       'module' => 'views',
     )),
 
     // hook_views_pre_execute().
     new XtoolsCallableTypeHookViews('views_pre_execute', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_pre_execute'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_pre_execute'),
       'module' => 'views',
     )),
 
     // hook_views_pre_render().
     new XtoolsCallableTypeHookViews('views_pre_render', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_pre_render'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_pre_render'),
       'module' => 'views',
     )),
 
     // hook_views_preview_info_alter().
     new XtoolsCallableTypeHookViews('views_preview_info_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_preview_info_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_preview_info_alter'),
       'module' => 'views',
     )),
 
     // hook_views_pre_view().
     new XtoolsCallableTypeHookViews('views_pre_view', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_pre_view'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_pre_view'),
       'module' => 'views',
     )),
 
     // hook_views_query_alter().
     new XtoolsCallableTypeHookViews('views_query_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_query_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_query_alter'),
       'module' => 'views',
     )),
 
     // hook_views_ui_display_top_links_alter().
     new XtoolsCallableTypeHookViews('views_ui_display_top_links_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_views_ui_display_top_links_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_views_ui_display_top_links_alter'),
       'module' => 'views',
     )),
 
     // hook_xtools_blueprint_info().
     new XtoolsCallableTypeHook('xtools_blueprint_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_xtools_blueprint_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_xtools_blueprint_info'),
     )),
 
     // hook_xtools_blueprint_info_alter().
     new XtoolsCallableTypeHook('xtools_blueprint_info_alter', array(
-      'signature' => new XtoolsSignatureInfo('hook_xtools_blueprint_info_alter'),
+      'signature' => new XtoolsSignaturePlaceholder('hook_xtools_blueprint_info_alter'),
     )),
 
     // hook_xtools_callable_type_info().
     new XtoolsCallableTypeHook('xtools_callable_type_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_xtools_callable_type_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_xtools_callable_type_info'),
     )),
 
     // hook_xtools_signature_info().
     new XtoolsCallableTypeHook('xtools_signature_info', array(
-      'blueprint' => new XtoolsBlueprintInfo('hook_xtools_signature_info'),
+      'blueprint' => new XtoolsBlueprintPlaceholder('hook_xtools_signature_info'),
     )),
   );
 }
