diff --git a/mollom.install b/mollom.install
index 5f7b558..b40e17a 100644
--- a/mollom.install
+++ b/mollom.install
@@ -107,14 +107,14 @@ function mollom_schema() {
         'not null' => TRUE,
         'default' => '',
       ),
-      'contentId' => array(
+      'contentid' => array(
         'description' => 'Content ID returned by Mollom.',
         'type' => 'varchar',
         'length' => 128,
         'not null' => TRUE,
         'default' => '',
       ),
-      'captchaId' => array(
+      'captchaid' => array(
         'description' => 'CAPTCHA ID returned by Mollom.',
         'type' => 'varchar',
         'length' => 128,
@@ -191,8 +191,8 @@ function mollom_schema() {
       ),
     ),
     'indexes' => array(
-      'contentId' => array('contentId'),
-      'captchaId' => array('captchaId'),
+      'contentid' => array('contentid'),
+      'captchaid' => array('captchaid'),
     ),
     'primary key' => array('entity', 'id'),
     'foreign keys' => array(
@@ -770,8 +770,8 @@ function mollom_update_7008() {
     db_add_primary_key('mollom', array('entity', 'id'));
   }
 
-  // When upgrading from 6.x-2.x, this is {mollom}.contentId already.
-  if (!db_field_exists('mollom', 'session_id') && !db_field_exists('mollom', 'contentId')) {
+  // When upgrading from 6.x-2.x, this is {mollom}.contentid already.
+  if (!db_field_exists('mollom', 'session_id') && !db_field_exists('mollom', 'contentid')) {
     db_drop_index('mollom', 'session');
     db_change_field('mollom', 'session', 'session_id', array(
       'description' => 'Session hash returned by Mollom.',
@@ -841,7 +841,7 @@ function mollom_update_7011() {
 }
 
 /**
- * Change {mollom}: Add 'spamClassification', change 'spam', replace 'session_id' with 'contentId' and 'captchaId'.
+ * Change {mollom}: Add 'spamClassification', change 'spam', replace 'session_id' with 'contentid' and 'captchaid'.
  */
 function mollom_update_7200() {
   variable_del('mollom_servers');
@@ -853,23 +853,23 @@ function mollom_update_7200() {
     db_drop_index('mollom', 'session_id');
     db_drop_field('mollom', 'session_id');
 
-    // Add 'contentId' and 'captchaId'.
-    db_add_field('mollom', 'contentId', array(
+    // Add 'contentid' and 'captchaid'.
+    db_add_field('mollom', 'contentid', array(
       'description' => 'Content ID returned by Mollom.',
       'type' => 'varchar',
       'length' => 128,
       'not null' => TRUE,
       'default' => '',
     ));
-    db_add_field('mollom', 'captchaId', array(
+    db_add_field('mollom', 'captchaid', array(
       'description' => 'CAPTCHA ID returned by Mollom.',
       'type' => 'varchar',
       'length' => 128,
       'not null' => TRUE,
       'default' => '',
     ));
-    db_add_index('mollom', 'contentId', array('contentId'));
-    db_add_index('mollom', 'captchaId', array('captchaId'));
+    db_add_index('mollom', 'contentid', array('contentid'));
+    db_add_index('mollom', 'captchaid', array('captchaid'));
   }
   // Add 'spamClassification'.
   if (!db_field_exists('mollom', 'spamClassification')) {
@@ -929,7 +929,7 @@ function mollom_update_7200() {
 }
 
 /**
- * Enlarge {mollom}.id to fit contentId and captchaId returned by Mollom.
+ * Enlarge {mollom}.id to fit contentid and captchaid returned by Mollom.
  */
 function mollom_update_7201() {
   db_change_field('mollom', 'id', 'id', array(
@@ -969,10 +969,10 @@ function mollom_update_7203() {
 /**
  * Remove corrupted Mollom data records.
  *
- * Due to a bug in the Mollom moderation system integration code, contentIds of
- * existing Mollom data records might have been overwritten with the contentId
- * of a new post; i.e., corrupted. These records lead to invalid contentId
- * lookup results now. Since the original contentIds are no longer available,
+ * Due to a bug in the Mollom moderation system integration code, contentids of
+ * existing Mollom data records might have been overwritten with the contentid
+ * of a new post; i.e., corrupted. These records lead to invalid contentid
+ * lookup results now. Since the original contentids are no longer available,
  * the corrupted Mollom data records have to be deleted.
  *
  * @see http://drupal.org/node/1470326
@@ -981,12 +981,12 @@ function mollom_update_7204() {
   // Ensure our core database layer bug workaround functions are loaded.
   drupal_load('module', 'mollom');
 
-  // Find all Mollom data records with duplicate contentIds.
-  $contentIds = mollom_db_query('SELECT contentId FROM {mollom} GROUP BY contentId HAVING COUNT(contentId) > 1')->fetchCol();
+  // Find all Mollom data records with duplicate contentids.
+  $contentids = mollom_db_query('SELECT contentid FROM {mollom} GROUP BY contentid HAVING COUNT(contentid) > 1')->fetchCol();
   // If there are any, delete them.
-  if (!empty($contentIds)) {
+  if (!empty($contentids)) {
     db_delete('mollom')
-      ->condition('contentId', $contentIds)
+      ->condition('contentid', $contentids)
       ->execute();
   }
 }
diff --git a/mollom.js b/mollom.js
index 6cd918b..53e5596 100644
--- a/mollom.js
+++ b/mollom.js
@@ -55,7 +55,7 @@ function getMollomCaptcha() {
       // Inject new CAPTCHA.
       $('.mollom-captcha-content', context).parent().html(data.content);
       // Update CAPTCHA ID.
-      $('input.mollom-captcha-id', context).val(data.captchaId);
+      $('input.mollom-captcha-id', context).val(data.captchaid);
       // Add an onclick-event handler for the new link.
       Drupal.attachBehaviors(context);
       // Focus on the CAPTCHA input.
diff --git a/mollom.module b/mollom.module
index 7ebf47e..9174c8c 100644
--- a/mollom.module
+++ b/mollom.module
@@ -338,8 +338,8 @@ function _mollom_access($permission = FALSE) {
  * primarily used for mails, messages, and posts, which pertain to forms
  * protected by Mollom that do no result in stored entities after submission.
  * For example, Contact module's contact form. They can be reported by anyone
- * having the link. $id is expected to be either a {mollom}.contentId or
- * {mollom}.captchaId respectively.
+ * having the link. $id is expected to be either a {mollom}.contentid or
+ * {mollom}.captchaid respectively.
  *
  * @see mollom_mail_add_report_link()
  *
@@ -425,13 +425,13 @@ function mollom_cron() {
 }
 
 /**
- * Load a Mollom data record by contentId.
+ * Load a Mollom data record by contentid.
  *
- * @param $contentId
- *   The contentId to retrieve data for.
+ * @param $contentid
+ *   The contentid to retrieve data for.
  */
-function mollom_content_load($contentId) {
-  return mollom_db_query_range('SELECT * FROM {mollom} WHERE contentId = :contentId', 0, 1, array(':contentId' => $contentId))->fetchObject();
+function mollom_content_load($contentid) {
+  return mollom_db_query_range('SELECT * FROM {mollom} WHERE contentid = :contentid', 0, 1, array(':contentid' => $contentid))->fetchObject();
 }
 
 /**
@@ -678,7 +678,7 @@ function mollom_data_report_multiple($entity, array $ids, $feedback) {
     // Load the Mollom session data.
     $data = mollom_data_load($entity, $id);
     // Send feedback, if we have session data.
-    if (!empty($data->contentId) || !empty($data->captchaId)) {
+    if (!empty($data->contentid) || !empty($data->captchaid)) {
       $result = _mollom_send_feedback($data, $feedback);
       $return = $return && $result;
     }
@@ -1504,8 +1504,8 @@ function _mollom_fallback() {
  *   - public_key: The public API key of this site.
  *   - url: The current, absolute URL of the form.
  *   At least one or both of:
- *   - contentId: The content ID of the Mollom session.
- *   - captchaId: The CAPTCHA ID of the Mollom session.
+ *   - contentid: The content ID of the Mollom session.
+ *   - captchaid: The CAPTCHA ID of the Mollom session.
  *   If available, to speed up and simplify the false-positive report form:
  *   - authorName: The author name, if supplied.
  *   - authorMail: The author's e-mail address, if supplied.
@@ -1516,7 +1516,7 @@ function _mollom_format_message_falsepositive($form_state, $data) {
   $params = array(
     'public_key' => $mollom->loadConfiguration('publicKey'),
   );
-  $params += array_intersect_key($form_state['values']['mollom'], array_flip(array('contentId', 'captchaId')));
+  $params += array_intersect_key($form_state['values']['mollom'], array_flip(array('contentid', 'captchaid')));
   $params += array_intersect_key($data, array_flip(array('authorName', 'authorMail')));
   $params['url'] = $GLOBALS['base_root'] . request_uri();
   $report_url .= '?' . drupal_http_build_query($params);
@@ -1633,13 +1633,13 @@ function mollom_process_mollom($element, &$form_state, $complete_form) {
     '#type' => 'value',
     '#value' => NULL,
   );
-  $element['contentId'] = array(
+  $element['contentid'] = array(
     '#type' => 'hidden',
     // There is no default value; Form API will always use the value that was
     // submitted last (including rebuild scenarios).
     '#attributes' => array('class' => 'mollom-content-id'),
   );
-  $element['captchaId'] = array(
+  $element['captchaid'] = array(
     '#type' => 'hidden',
     '#attributes' => array('class' => 'mollom-captcha-id'),
   );
@@ -1751,8 +1751,8 @@ function mollom_form_add_captcha(&$element, &$form_state) {
     $element['captcha']['#field_prefix'] = $captcha;
 
     // Ensure that the latest CAPTCHA ID is output as value.
-    $element['captchaId']['#value'] = $form_state['mollom']['response']['captcha']['id'];
-    $form_state['values']['mollom']['captchaId'] = $form_state['mollom']['response']['captcha']['id'];
+    $element['captchaid']['#value'] = $form_state['mollom']['response']['captcha']['id'];
+    $form_state['values']['mollom']['captchaid'] = $form_state['mollom']['response']['captcha']['id'];
   }
   // Otherwise, we have a communication or configuration error.
   else {
@@ -1781,8 +1781,8 @@ function mollom_validate_analysis(&$form, &$form_state) {
   if (isset($data['postId'])) {
     unset($data['postId']);
   }
-  if (!empty($form_state['values']['mollom']['contentId'])) {
-    $data['id'] = $form_state['values']['mollom']['contentId'];
+  if (!empty($form_state['values']['mollom']['contentid'])) {
+    $data['id'] = $form_state['values']['mollom']['contentid'];
   }
   $data['checks'] = $form_state['mollom']['checks'];
   $data['strictness'] = $form_state['mollom']['strictness'];
@@ -1806,14 +1806,14 @@ function mollom_validate_analysis(&$form, &$form_state) {
   $form_state['mollom']['response']['content'] = $result;
   // Set form values accordingly. Do not overwrite the entity ID.
   // @todo Rename 'id' to 'entity_id'.
-  $result['contentId'] = $result['id'];
+  $result['contentid'] = $result['id'];
   unset($result['id']);
   $form_state['values']['mollom'] = array_merge($form_state['values']['mollom'], $result);
 
   // Ensure the latest content ID is output as value.
   // form_set_value() is effectless, as this is not a element-level but a
   // form-level validation handler.
-  $form['mollom']['contentId']['#value'] = $result['contentId'];
+  $form['mollom']['contentid']['#value'] = $result['contentid'];
 
   // Prepare watchdog message teaser text.
   $teaser = '--';
@@ -1914,7 +1914,7 @@ function mollom_validate_analysis(&$form, &$form_state) {
   // validation, then the rebuilt form will have no indication that it passed
   // analysis and will be auto-populated with values from $form_state['input'].
   if (!$form_state['mollom']['require_captcha']) {
-    $form_state['input']['mollom']['captchaId'] = '';
+    $form_state['input']['mollom']['captchaid'] = '';
   }
 }
 
@@ -1930,7 +1930,7 @@ function mollom_validate_captcha(&$form, &$form_state) {
     // For text analysis, only validate the CAPTCHA if there is an ID. If the ID
     // is maliciously removed from the form values, text analysis will punish
     // the author's reputation and present a new CAPTCHA to solve.
-    if (empty($form_state['values']['mollom']['captchaId'])) {
+    if (empty($form_state['values']['mollom']['captchaid'])) {
       return;
     }
   }
@@ -1941,7 +1941,7 @@ function mollom_validate_captcha(&$form, &$form_state) {
       return;
     }
     // If there is no CAPTCHA ID yet, retrieve one and throw an error.
-    if (empty($form_state['values']['mollom']['captchaId'])) {
+    if (empty($form_state['values']['mollom']['captchaid'])) {
       mollom_form_add_captcha($form['mollom'], $form_state);
       form_error($form['mollom']['captcha'], t('To complete this form, please complete the word verification below.'));
       return;
@@ -1973,7 +1973,7 @@ function mollom_validate_captcha(&$form, &$form_state) {
     return;
   }
   $data = array(
-    'id' => $form_state['values']['mollom']['captchaId'],
+    'id' => $form_state['values']['mollom']['captchaid'],
     'solution' => $form_state['values']['mollom']['captcha'],
     'authorIp' => $all_data['authorIp'],
   );
@@ -2001,21 +2001,21 @@ function mollom_validate_captcha(&$form, &$form_state) {
     $form_state['mollom']['response']['captcha'] = $result;
     // Set form values accordingly. Do not overwrite the entity ID.
     // @todo Rename 'id' to 'entity_id'.
-    $result['captchaId'] = $result['id'];
+    $result['captchaid'] = $result['id'];
     unset($result['id']);
     $form_state['values']['mollom'] = array_merge($form_state['values']['mollom'], $result);
 
     // Ensure the latest CAPTCHA ID is output as value.
     // form_set_value() is effectless, as this is not a element-level but a
     // form-level validation handler.
-    $form['mollom']['captchaId']['#value'] = $result['captchaId'];
+    $form['mollom']['captchaid']['#value'] = $result['captchaid'];
   }
 
   if (!empty($result['solved'])) {
     // For text analysis, remove the CAPTCHA ID from the output if it was
     // solved, so this validation handler does not run again.
     if ($form_state['mollom']['require_analysis']) {
-      $form['mollom']['captchaId']['#value'] = '';
+      $form['mollom']['captchaid']['#value'] = '';
     }
     $form_state['mollom']['passed_captcha'] = TRUE;
     $form['mollom']['captcha']['#access'] = FALSE;
@@ -2048,7 +2048,7 @@ function mollom_validate_captcha(&$form, &$form_state) {
 function mollom_pre_render_mollom($element) {
   // If there is no CAPTCHA ID, then there is no CAPTCHA that can be displayed.
   // If a CAPTCHA was solved, then the widget makes no sense either.
-  if (empty($element['captchaId']['#value']) || !empty($element['captcha']['#solved'])) {
+  if (empty($element['captchaid']['#value']) || !empty($element['captcha']['#solved'])) {
     $element['captcha']['#access'] = FALSE;
   }
   else {
@@ -2064,8 +2064,8 @@ function mollom_pre_render_mollom($element) {
   $element['captcha']['#value'] = '';
 
   // DX: Debugging helpers.
-//  $element['#suffix'] = 'contentId: ' . $element['contentId']['#value'] . '<br>';
-//  $element['#suffix'] .= 'captchaId: ' . $element['captchaId']['#value'] . '<br>';
+//  $element['#suffix'] = 'contentid: ' . $element['contentid']['#value'] . '<br>';
+//  $element['#suffix'] .= 'captchaid: ' . $element['captchaid']['#value'] . '<br>';
 
   return $element;
 }
@@ -2421,25 +2421,25 @@ function _mollom_format_string($string, array $args = array()) {
  *
  * @param $data
  *   A Mollom data record containing one or both of:
- *   - contentId: The content ID to send feedback for.
- *   - captchaId: The CAPTCHA ID to send feedback for.
+ *   - contentid: The content ID to send feedback for.
+ *   - captchaid: The CAPTCHA ID to send feedback for.
  * @param $reason
  *   The feedback to send, one of 'spam', 'profanity', 'quality', 'unwanted',
  *   'approve'.
  */
 function _mollom_send_feedback($data, $reason = 'spam') {
   $params = array();
-  if (!empty($data->captchaId)) {
-    $params['captchaId'] = $data->captchaId;
+  if (!empty($data->captchaid)) {
+    $params['captchaid'] = $data->captchaid;
     $resource = 'CAPTCHA';
-    $id = $data->captchaId;
+    $id = $data->captchaid;
   }
-  // In case we also have a contentId, also pass that, and override $resource
+  // In case we also have a contentid, also pass that, and override $resource
   // and $id for the log message.
-  if (!empty($data->contentId)) {
-    $params['contentId'] = $data->contentId;
+  if (!empty($data->contentid)) {
+    $params['contentid'] = $data->contentid;
     $resource = 'content';
-    $id = $data->contentId;
+    $id = $data->contentid;
   }
   if (!isset($id)) {
     return FALSE;
@@ -2558,8 +2558,8 @@ function mollom_get_captcha(&$form_state) {
     'type' => $form_state['mollom']['captcha_type'],
     'ssl' => (int) (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'),
   );
-  if (!empty($form_state['values']['mollom']['contentId'])) {
-    $data['contentId'] = $form_state['values']['mollom']['contentId'];
+  if (!empty($form_state['values']['mollom']['contentid'])) {
+    $data['contentid'] = $form_state['values']['mollom']['contentid'];
   }
   $result = mollom()->createCaptcha($data);
 
@@ -2651,7 +2651,7 @@ function mollom_mail_add_report_link(array &$message, array $mollom) {
       $data = mollom_content_load($mollom['response']['content']['id']);
     }
     elseif (!empty($mollom['response']['captcha']['id'])) {
-      $data = mollom_db_query_range('SELECT * FROM {mollom} WHERE captchaId = :captchaId', 0, 1, array(':captchaId' => $mollom['response']['captcha']['id']))->fetchObject();
+      $data = mollom_db_query_range('SELECT * FROM {mollom} WHERE captchaid = :captchaid', 0, 1, array(':captchaid' => $mollom['response']['captcha']['id']))->fetchObject();
     }
     if (!$data) {
       // @todo Mollom session data should have been saved earlier already;
@@ -2660,12 +2660,12 @@ function mollom_mail_add_report_link(array &$message, array $mollom) {
       if (!empty($mollom['response']['content']['id'])) {
         $data->entity = 'mollom_content';
         $data->id = $data->content['id'];
-        $data->contentId = $data->content['id'];
+        $data->contentid = $data->content['id'];
       }
       else {
         $data->entity = 'mollom_captcha';
         $data->id = $data->captcha['id'];
-        $data->captchaId = $data->captcha['id'];
+        $data->captchaid = $data->captcha['id'];
       }
       $data->form_id = $mollom['form_id'];
       mollom_data_save($data);
@@ -2747,7 +2747,7 @@ function mollom_entity_delete($entity, $type) {
  */
 function mollom_mollom_data_insert($data) {
   // Only content can be updated.
-  if (empty($data->contentId)) {
+  if (empty($data->contentid)) {
     return;
   }
   // Exclude data for form submissions not resulting in a locally stored entity.
@@ -2763,7 +2763,7 @@ function mollom_mollom_data_insert($data) {
   }
 
   // Mark the content as stored.
-  $params['id'] = $data->contentId;
+  $params['id'] = $data->contentid;
   $params['stored'] = 1;
 
   // Add the URL of the posted content itself.
@@ -2800,7 +2800,7 @@ function mollom_mollom_data_insert($data) {
  */
 function mollom_mollom_data_delete($data) {
   // Only content can be deleted.
-  if (empty($data->contentId)) {
+  if (empty($data->contentid)) {
     return;
   }
   // Exclude data for form submissions not resulting in a locally stored entity.
@@ -2816,7 +2816,7 @@ function mollom_mollom_data_delete($data) {
   }
 
   // Mark the content as discarded (not stored).
-  $params['id'] = $data->contentId;
+  $params['id'] = $data->contentid;
   $params['stored'] = 0;
 
   $result = mollom()->checkContent($params);
diff --git a/mollom.pages.inc b/mollom.pages.inc
index 87e805a..c408e94 100644
--- a/mollom.pages.inc
+++ b/mollom.pages.inc
@@ -12,17 +12,17 @@
  *   The new CAPTCHA type to retrieve, e.g. 'image' or 'audio'.
  * @param $form_build_id
  *   The internal form build id of the form to update the CAPTCHA for.
- * @param $contentId
+ * @param $contentid
  *   (optional) The associated content ID in the form.
  *
  * @return
  *   A JSON array containing:
  *   - content: The HTML markup for the new CAPTCHA.
- *   - captchaId: The ID for the new CAPTCHA.
+ *   - captchaid: The ID for the new CAPTCHA.
  *
  * @todo Add error handling.
  */
-function mollom_captcha_js($type, $form_build_id, $contentId = NULL) {
+function mollom_captcha_js($type, $form_build_id, $contentid = NULL) {
   // Deny GET requests to make automated security audit tools not complain
   // about a JSON Hijacking possibility.
   // @see http://capec.mitre.org/data/definitions/111.html
@@ -41,8 +41,8 @@ function mollom_captcha_js($type, $form_build_id, $contentId = NULL) {
   }
   else {
     $form_state['mollom'] = array();
-    if (isset($contentId)) {
-      $form_state['values']['mollom']['contentId'] = $contentId;
+    if (isset($contentid)) {
+      $form_state['values']['mollom']['contentid'] = $contentid;
     }
   }
   $form_state['mollom']['captcha_type'] = $type;
@@ -59,7 +59,7 @@ function mollom_captcha_js($type, $form_build_id, $contentId = NULL) {
     // Return new content and CAPTCHA ID via JSON.
     $data = array(
       'content' => $captcha,
-      'captchaId' => $form_state['mollom']['response']['captcha']['id'],
+      'captchaid' => $form_state['mollom']['response']['captcha']['id'],
     );
     drupal_json_output($data);
   }
@@ -112,7 +112,7 @@ function mollom_report_form_submit($form, &$form_state) {
     $data = mollom_data_load($entity, $id);
 
     // Send feedback to Mollom, if we have session data.
-    if ((!empty($data->contentId) || !empty($data->captchaId)) && !empty($form_state['values']['mollom']['feedback'])) {
+    if ((!empty($data->contentid) || !empty($data->captchaid)) && !empty($form_state['values']['mollom']['feedback'])) {
       if (_mollom_send_feedback($data, $form_state['values']['mollom']['feedback'])) {
         drupal_set_message(t('The content was successfully reported as inappropriate.'));
       }
diff --git a/includes/mollom.class.inc b/includes/mollom.class.inc
index 0e2c795..9436f3f 100644
--- a/includes/mollom.class.inc
+++ b/includes/mollom.class.inc
@@ -1129,7 +1129,7 @@ abstract class Mollom {
    *   - type: A string denoting the type of CAPTCHA to create; one of 'image'
    *     or 'audio'.
    *   and any of the keys:
-   *   - contentId: The ID of a content resource to link the CAPTCHA to. Allows
+   *   - contentid: The ID of a content resource to link the CAPTCHA to. Allows
    *     Mollom to learn when it was unsure.
    *   - ssl: An integer denoting whether to create a CAPTCHA URL using HTTPS
    *     (1) or not (0). Only available for paid subscriptions.
@@ -1204,20 +1204,20 @@ abstract class Mollom {
    * @param array $data
    *   An associative array containing:
    *   - reason: A string denoting the reason for why the content associated
-   *     with either contentId or captchaId is being reported; one of:
+   *     with either contentid or captchaid is being reported; one of:
    *     - spam: The content is spam, unsolicited advertising.
    *     - profanity: The content contains obscene, violent, profane language.
    *     - quality: The content is of low quality.
    *     - unwanted: The content is unwanted, taunting, off-topic.
    *   and at least one of:
-   *   - contentId: A Mollom content ID associated with the content.
-   *   - captchaId: A Mollom CAPTCHA ID associated with the content.
+   *   - contentid: A Mollom content ID associated with the content.
+   *   - captchaid: A Mollom CAPTCHA ID associated with the content.
    *
    * @return bool
    *   TRUE if the feedback was sent successfully, FALSE otherwise.
    */
   public function sendFeedback(array $data) {
-    if (empty($data['contentId']) && empty($data['captchaId'])) {
+    if (empty($data['contentid']) && empty($data['captchaid'])) {
       return FALSE;
     }
     if (empty($data['reason'])) {
diff --git a/tests/mollom.test b/tests/mollom.test
index 5507783..1f08a44 100644
--- a/tests/mollom.test
+++ b/tests/mollom.test
@@ -256,7 +256,7 @@ class MollomWebTestCase extends DrupalWebTestCase {
    * redirected), then we will get a new session_id.
    *
    * @param $type
-   *   The type of ID to assert; e.g., 'contentId', 'captchaId'.
+   *   The type of ID to assert; e.g., 'contentid', 'captchaid'.
    * @param $id
    *   The ID of $type in the last request, as returned from Mollom.
    * @param $new_expected
@@ -282,7 +282,7 @@ class MollomWebTestCase extends DrupalWebTestCase {
    * Reset the statically cached Mollom session id.
    *
    * @param $type
-   *   The type of ID to reset; e.g., 'contentId', 'captchaId'.
+   *   The type of ID to reset; e.g., 'contentid', 'captchaid'.
    */
   protected function resetResponseID($type = NULL) {
     if (isset($type)) {
@@ -310,7 +310,7 @@ class MollomWebTestCase extends DrupalWebTestCase {
    *   to verify that the proper session id was stored in the database.
    *
    * @param $type
-   *   The type of ID to assert; e.g., 'contentId', 'captchaId'.
+   *   The type of ID to assert; e.g., 'contentid', 'captchaid'.
    * @param $new_expected
    *   (optional) Boolean indicating whether a new ID is expected; e.g., after
    *   incorrectly solving a CAPTCHA.
@@ -511,7 +511,7 @@ class MollomWebTestCase extends DrupalWebTestCase {
    * @param $id
    *   The entity id to search for in {mollom}.
    * @param $response_type
-   *   (optional) The type of ID to assert; e.g., 'contentId', 'captchaId'.
+   *   (optional) The type of ID to assert; e.g., 'contentid', 'captchaid'.
    * @param $response_id
    *   (optional) The ID of $type to assert additionally.
    */
@@ -1388,7 +1388,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertSame('spamClassification', $result['spamClassification'], 'ham');
     $this->assertTrue(!isset($result['qualityScore']), 'qualityScore not returned.');
     $this->assertTrue(!isset($result['profanityScore']), 'profanityScore not returned.');
-    $data['id'] = $this->assertResponseID('contentId', $result['id']);
+    $data['id'] = $this->assertResponseID('contentid', $result['id']);
 
     // Ensure proper response for 'spam' submissions, re-using session_id.
     $data['postBody'] = 'spam';
@@ -1398,7 +1398,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertSame('spamClassification', $result['spamClassification'], 'spam');
     $this->assertTrue(!isset($result['qualityScore']), 'qualityScore not returned.');
     $this->assertTrue(!isset($result['profanityScore']), 'profanityScore not returned.');
-    $data['id'] = $this->assertResponseID('contentId', $result['id']);
+    $data['id'] = $this->assertResponseID('contentid', $result['id']);
 
     // Ensure proper response for 'unsure' submissions, re-using session_id.
     $data['postBody'] = 'unsure';
@@ -1408,7 +1408,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertSame('spamClassification', $result['spamClassification'], 'unsure');
     $this->assertTrue(!isset($result['qualityScore']), 'qualityScore not returned.');
     $this->assertTrue(!isset($result['profanityScore']), 'profanityScore not returned.');
-    $data['id'] = $this->assertResponseID('contentId', $result['id']);
+    $data['id'] = $this->assertResponseID('contentid', $result['id']);
 
     // Additionally enable profanity checking.
     $data['postBody'] = 'spam profanity';
@@ -1419,7 +1419,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertSame('spamClassification', $result['spamClassification'], 'spam');
     $this->assertSame('qualityScore', $result['qualityScore'], 0.0);
     $this->assertSame('profanityScore', $result['profanityScore'], 1.0);
-    $data['id'] = $this->assertResponseID('contentId', $result['id']);
+    $data['id'] = $this->assertResponseID('contentid', $result['id']);
 
     // Change the string to contain profanity only.
     $data['postBody'] = 'profanity';
@@ -1430,7 +1430,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertSame('spamClassification', $result['spamClassification'], 'unsure');
     $this->assertSame('qualityScore', $result['qualityScore'], 0.0);
     $this->assertSame('profanityScore', $result['profanityScore'], 1.0);
-    $data['id'] = $this->assertResponseID('contentId', $result['id']);
+    $data['id'] = $this->assertResponseID('contentid', $result['id']);
 
     // Disable spam checking, only do profanity checking.
     $data['postBody'] = 'spam profanity';
@@ -1441,7 +1441,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertTrue(!isset($result['spamClassification']), 'spamClassification not returned.');
     $this->assertTrue(!isset($result['qualityScore']), 'qualityScore not returned.');
     $this->assertSame('profanityScore', $result['profanityScore'], 1.0);
-    $data['id'] = $this->assertResponseID('contentId', $result['id']);
+    $data['id'] = $this->assertResponseID('contentid', $result['id']);
 
     // Pass arbitrary string to profanity checking.
     $data['postBody'] = $this->randomString(12);
@@ -1451,7 +1451,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertTrue(!isset($result['spamClassification']), 'spamClassification not returned.');
     $this->assertTrue(!isset($result['qualityScore']), 'qualityScore not returned.');
     $this->assertSame('profanityScore', $result['profanityScore'], 0.0);
-    $data['id'] = $this->assertResponseID('contentId', $result['id']);
+    $data['id'] = $this->assertResponseID('contentid', $result['id']);
   }
 
   /**
@@ -1478,22 +1478,22 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertMollomWatchdogMessages();
     $this->assertSame('spamScore', $result['spamScore'], 0.5);
     $this->assertSame('spamClassification', $result['spamClassification'], 'unsure');
-    $contentId = $this->assertResponseID('contentId', $result['id']);
-    $content_data['id'] = &$contentId;
+    $contentid = $this->assertResponseID('contentid', $result['id']);
+    $content_data['id'] = &$contentid;
 
     $captcha_data = array(
       'type' => 'image',
-      'contentId' => &$contentId,
+      'contentid' => &$contentid,
       'authorIp' => $base_data['authorIp'],
     );
     $result = $mollom->createCaptcha($captcha_data);
     $this->assertMollomWatchdogMessages();
-    $captchaId = $this->assertResponseID('captchaId', $result['id']);
-    $content_data['captchaId'] = &$captchaId;
+    $captchaid = $this->assertResponseID('captchaid', $result['id']);
+    $content_data['captchaid'] = &$captchaid;
 
     $captcha_data = array(
-      'id' => &$captchaId,
-      'contentId' => &$contentId,
+      'id' => &$captchaid,
+      'contentid' => &$contentid,
       'authorIp' => $base_data['authorIp'],
       'authorId' => $base_data['authorId'],
       'solution' => 'correct',
@@ -1507,7 +1507,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertMollomWatchdogMessages();
     $this->assertSame('spamScore', $result['spamScore'], 1.0);
     $this->assertSame('spamClassification', $result['spamClassification'], 'spam');
-    $contentId = $this->assertResponseID('contentId', $result['id']);
+    $contentid = $this->assertResponseID('contentid', $result['id']);
 
     // @todo Enable following sequence after fixing Testing API.
     return;
@@ -1528,22 +1528,22 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertMollomWatchdogMessages();
     $this->assertSame('spamScore', $result['spamScore'], 0.5);
     $this->assertSame('spamClassification', $result['spamClassification'], 'unsure');
-    $contentId = $this->assertResponseID('contentId', $result['id']);
-    $content_data['id'] = &$contentId;
+    $contentid = $this->assertResponseID('contentid', $result['id']);
+    $content_data['id'] = &$contentid;
 
     $captcha_data = array(
       'type' => 'image',
-      'contentId' => &$contentId,
+      'contentid' => &$contentid,
       'authorIp' => $base_data['authorIp'],
     );
     $result = $mollom->createCaptcha($captcha_data);
     $this->assertMollomWatchdogMessages();
-    $captchaId = $this->assertResponseID('captchaId', $result['id']);
-    $content_data['captchaId'] = &$captchaId;
+    $captchaid = $this->assertResponseID('captchaid', $result['id']);
+    $content_data['captchaid'] = &$captchaid;
 
     $captcha_data = array(
-      'id' => &$captchaId,
-      'contentId' => &$contentId,
+      'id' => &$captchaid,
+      'contentid' => &$contentid,
       'authorIp' => $base_data['authorIp'],
       'authorId' => $base_data['authorId'],
       'solution' => 'correct',
@@ -1557,21 +1557,21 @@ class MollomResponseTestCase extends MollomWebTestCase {
     $this->assertMollomWatchdogMessages();
     //$this->assertSame('spamScore', $result['spamScore'], 0.0);
     $this->assertSame('spamClassification', $result['spamClassification'], 'ham');
-    $contentId = $this->assertResponseID('contentId', $result['id']);
+    $contentid = $this->assertResponseID('contentid', $result['id']);
 
     $content_data['postBody'] = 'ham';
     $result = $mollom->checkContent($content_data);
     $this->assertMollomWatchdogMessages();
     //$this->assertSame('spamScore', $result['spamScore'], 0.0);
     $this->assertSame('spamClassification', $result['spamClassification'], 'ham');
-    $contentId = $this->assertResponseID('contentId', $result['id']);
+    $contentid = $this->assertResponseID('contentid', $result['id']);
 
     $content_data['postBody'] = 'unsure';
     $result = $mollom->checkContent($content_data);
     $this->assertMollomWatchdogMessages();
     //$this->assertSame('spamScore', $result['spamScore'], 0.0);
     $this->assertSame('spamClassification', $result['spamClassification'], 'ham');
-    $contentId = $this->assertResponseID('contentId', $result['id']);
+    $contentid = $this->assertResponseID('contentid', $result['id']);
   }
 
   /**
@@ -1647,7 +1647,7 @@ class MollomResponseTestCase extends MollomWebTestCase {
     );
     $result = $mollom->createCaptcha($data);
     $this->assertMollomWatchdogMessages();
-    $data['id'] = $this->assertResponseID('captchaId', $result['id']);
+    $data['id'] = $this->assertResponseID('captchaid', $result['id']);
 
     $data += array(
       'solution' => 'correct',
@@ -2224,14 +2224,14 @@ class MollomProfanityTestCase extends MollomWebTestCase {
     $this->drupalPost(NULL, $edit, 'Submit');
     $this->assertText($this->profanity_message);
     $this->assertNoText('Successful form submission.');
-    $contentId = $this->assertResponseIDInForm('contentId');
+    $contentid = $this->assertResponseIDInForm('contentid');
 
     $edit['body'] = 'not profane ham';
     $this->drupalPost(NULL, $edit, 'Submit');
     $this->assertNoText($this->profanity_message);
     $this->assertText('Successful form submission.');
     $mid = $this->getFieldValueByName('mid');
-    $this->assertMollomData('mollom_test', $mid, 'contentId', $contentId);
+    $this->assertMollomData('mollom_test', $mid, 'contentid', $contentid);
 
     // Sequence: Post unsure spam (not profanity), post profanity along with
     // correct CAPTCHA, and expect that to be discarded.
@@ -2251,8 +2251,8 @@ class MollomProfanityTestCase extends MollomWebTestCase {
     $this->assertCaptchaField();
     $this->assertNoText($this->profanity_message);
     $this->assertNoText('Successful form submission.');
-    $contentId = $this->assertResponseIDInForm('contentId');
-    $captchaId = $this->assertResponseIDInForm('captchaId');
+    $contentid = $this->assertResponseIDInForm('contentid');
+    $captchaid = $this->assertResponseIDInForm('captchaid');
 
     $edit['body'] = 'unsure profanity';
     $this->postCorrectCaptcha(NULL, $edit, 'Submit');
@@ -2869,7 +2869,7 @@ class MollomNodeFormTestCase extends MollomWebTestCase {
     // Login and submit a node.
     $this->drupalLogin($this->web_user);
     $this->drupalGet('node/add/article');
-    $captchaId = $this->assertResponseIDInForm('captchaId');
+    $captchaid = $this->assertResponseIDInForm('captchaid');
     $edit = array(
       'title' => 'spam',
       'mollom[captcha]' => 'correct',
@@ -2877,7 +2877,7 @@ class MollomNodeFormTestCase extends MollomWebTestCase {
     $this->drupalPost(NULL, $edit, t('Save'));
     $this->node = $this->drupalGetNodeByTitle($edit['title']);
     $this->assertUrl('node/' . $this->node->nid);
-    $this->assertMollomData('node', $this->node->nid, 'captchaId', $captchaId);
+    $this->assertMollomData('node', $this->node->nid, 'captchaid', $captchaid);
   }
 
   /**
@@ -3024,21 +3024,21 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
     $this->drupalLogin($this->web_user);
     $this->drupalGet('comment/reply/' . $this->node->nid);
     $this->assertCaptchaField();
-    $this->assertResponseIDInForm('captchaId');
+    $this->assertResponseIDInForm('captchaid');
     $this->assertNoPrivacyLink();
 
     // Try to submit an incorrect answer for the CAPTCHA, without value for
     // required field.
     $this->postIncorrectCaptcha(NULL, array(), t('Preview'));
     $this->assertText(t('Comment field is required.'));
-    $this->assertResponseIDInForm('captchaId', TRUE);
+    $this->assertResponseIDInForm('captchaid', TRUE);
     $this->assertNoPrivacyLink();
 
     // Try to submit a correct answer for the CAPTCHA, still without required
     // field value.
     $this->postCorrectCaptcha(NULL, array(), t('Preview'));
     $this->assertText(t('Comment field is required.'));
-    $captchaId = $this->assertResponseIDInForm('captchaId', TRUE);
+    $captchaid = $this->assertResponseIDInForm('captchaid', TRUE);
     $this->assertNoPrivacyLink();
 
     // Finally, we should be able to submit a comment.
@@ -3046,14 +3046,14 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
     $this->assertText(t('Your comment has been posted.'));
     $this->assertRaw('<p>spam</p>', t('Spam comment could be posted with correct CAPTCHA.'));
     $cid = db_query('SELECT cid FROM {comment} WHERE subject = :subject ORDER BY created DESC', array(':subject' => 'spam'))->fetchField();
-    $this->assertMollomData('comment', $cid, 'captchaId', $captchaId);
+    $this->assertMollomData('comment', $cid, 'captchaid', $captchaid);
 
     // Verify we can solve the CAPTCHA directly.
     $this->resetResponseID();
     $value = 'some more spam';
     $this->drupalGet('comment/reply/' . $this->node->nid);
     $this->assertCaptchaField();
-    $captchaId = $this->assertResponseIDInForm('captchaId');
+    $captchaid = $this->assertResponseIDInForm('captchaid');
     $edit = array(
       'comment_body[und][0][value]' => $value,
       'mollom[captcha]' => 'correct',
@@ -3061,7 +3061,7 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
     $this->drupalPost(NULL, $edit, t('Save'));
     $this->assertText(t('Your comment has been posted.'));
     $cid = db_query('SELECT cid FROM {comment} WHERE subject = :subject ORDER BY created DESC', array(':subject' => $value))->fetchField();
-    $this->assertMollomData('comment', $cid, 'captchaId', $captchaId);
+    $this->assertMollomData('comment', $cid, 'captchaid', $captchaid);
   }
 
   /**
@@ -3085,7 +3085,7 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
     );
     $this->drupalPost(NULL, $edit, t('Save'));
     $this->assertCaptchaField();
-    $contentId = $this->assertResponseIDInForm('contentId');
+    $contentid = $this->assertResponseIDInForm('contentid');
     $this->assertPrivacyLink();
 
     // Try to submit the form by solving the CAPTCHA incorrectly. At this point,
@@ -3093,14 +3093,14 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
     // the comment is still neither ham or spam.
     $this->postIncorrectCaptcha(NULL, array(), t('Save'));
     $this->assertCaptchaField();
-    $captchaId = $this->assertResponseIDInForm('captchaId');
+    $captchaid = $this->assertResponseIDInForm('captchaid');
     $this->assertPrivacyLink();
 
     // Correctly solving the CAPTCHA should accept the form submission.
     $this->postCorrectCaptcha(NULL, array(), t('Save'));
     $this->assertRaw('<p>' . $edit['comment_body[und][0][value]'] . '</p>', t('A comment that may contain spam was found.'));
     $cid = db_query('SELECT cid FROM {comment} WHERE subject = :subject ORDER BY created DESC', array(':subject' => $edit['comment_body[und][0][value]']))->fetchField();
-    $this->assertMollomData('comment', $cid, 'contentId', $contentId);
+    $this->assertMollomData('comment', $cid, 'contentid', $contentid);
 
     // Try to save a new 'spam' comment; it should be discarded, with no CAPTCHA
     // appearing on the page.
@@ -3109,13 +3109,13 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
     $this->assertPrivacyLink();
     $original_number_of_comments = $this->getCommentCount($this->node->nid);
     $this->assertSpamSubmit(NULL, array('comment_body[und][0][value]'), array(), t('Save'));
-    $contentId = $this->assertResponseIDInForm('contentId');
+    $contentid = $this->assertResponseIDInForm('contentid');
     $this->assertCommentCount($this->node->nid, $original_number_of_comments);
     $this->assertPrivacyLink();
 
     // Try to save again; it should be discarded, with no CAPTCHA.
     $this->assertSpamSubmit(NULL, array('comment_body[und][0][value]'), array(), t('Save'));
-    $contentId = $this->assertResponseIDInForm('contentId');
+    $contentid = $this->assertResponseIDInForm('contentid');
     $this->assertCommentCount($this->node->nid, $original_number_of_comments);
     $this->assertPrivacyLink();
 
@@ -3732,16 +3732,16 @@ class MollomDataTestCase extends MollomWebTestCase {
     $edit['title'] = 'unsure';
     $this->drupalPost(NULL, $edit, 'Submit');
     $this->assertCaptchaField();
-    $contentId = $this->assertResponseIDInForm('contentId');
-    $captchaId = $this->assertResponseIDInForm('captchaId');
+    $contentid = $this->assertResponseIDInForm('contentid');
+    $captchaid = $this->assertResponseIDInForm('captchaid');
     $this->postCorrectCaptcha(NULL, array(), 'Submit', 'Successful form submission.');
     $new_data = $this->assertMollomData('mollom_test', $mid);
 
     // Verify that only session data was updated.
     $this->assertSame('entity', $data->entity, $new_data->entity);
     $this->assertSame('id', $data->id, $new_data->id);
-    $this->assertNotSame('contentId', $data->contentId, $new_data->contentId);
-    $this->assertNotSame('captchaId', $data->captchaId, $new_data->captchaId);
+    $this->assertNotSame('contentid', $data->contentid, $new_data->contentid);
+    $this->assertNotSame('captchaid', $data->captchaid, $new_data->captchaid);
     $this->assertSame('form_id', $data->form_id, $new_data->form_id);
     $this->assertSame('qualityScore', $data->qualityScore, $new_data->qualityScore);
     $count = db_query("SELECT COUNT(1) FROM {mollom}")->fetchField();
@@ -3791,28 +3791,28 @@ class MollomDataCRUDTestCase extends MollomWebTestCase {
       'entity' => 'type1',
       'id' => 123,
       'form_id' => 'type1_form',
-      'contentId' => 1,
+      'contentid' => 1,
     );
     mollom_data_save($data1);
-    $this->assertMollomData($data1->entity, $data1->id, 'contentId', $data1->contentId);
+    $this->assertMollomData($data1->entity, $data1->id, 'contentid', $data1->contentid);
 
     // Create a second data record; same ID, different entity type.
     $data2 = (object) array(
       'entity' => 'type2',
       'id' => 123,
       'form_id' => 'type2_form',
-      'contentId' => 2,
+      'contentid' => 2,
     );
     mollom_data_save($data2);
-    $this->assertMollomData($data2->entity, $data2->id, 'contentId', $data2->contentId);
+    $this->assertMollomData($data2->entity, $data2->id, 'contentid', $data2->contentid);
 
     // Update the first data record.
-    $data1->contentId = 3;
+    $data1->contentid = 3;
     mollom_data_save($data1);
 
     // Verify that both records are correct.
-    $this->assertMollomData($data1->entity, $data1->id, 'contentId', $data1->contentId);
-    $this->assertMollomData($data2->entity, $data2->id, 'contentId', $data2->contentId);
+    $this->assertMollomData($data1->entity, $data1->id, 'contentid', $data1->contentid);
+    $this->assertMollomData($data2->entity, $data2->id, 'contentid', $data2->contentid);
   }
 
   /**
@@ -3824,7 +3824,7 @@ class MollomDataCRUDTestCase extends MollomWebTestCase {
       'entity' => 'type1',
       'id' => 123,
       'form_id' => 'type1_form',
-      'contentId' => 1,
+      'contentid' => 1,
     );
     mollom_data_save($data1);
 
@@ -3833,20 +3833,20 @@ class MollomDataCRUDTestCase extends MollomWebTestCase {
       'entity' => 'type2',
       'id' => 123,
       'form_id' => 'type2_form',
-      'contentId' => 2,
+      'contentid' => 2,
     );
     mollom_data_save($data2);
 
     // Verify that both records exist.
-    $this->assertMollomData($data1->entity, $data1->id, 'contentId', $data1->contentId);
-    $this->assertMollomData($data2->entity, $data2->id, 'contentId', $data2->contentId);
+    $this->assertMollomData($data1->entity, $data1->id, 'contentid', $data1->contentid);
+    $this->assertMollomData($data2->entity, $data2->id, 'contentid', $data2->contentid);
 
     // Delete the first data record.
     mollom_data_delete($data1->entity, $data1->id);
 
     // Verify that only the second record remained and was not changed.
     $this->assertNoMollomData($data1->entity, $data1->id);
-    $this->assertMollomData($data2->entity, $data2->id, 'contentId', $data2->contentId);
+    $this->assertMollomData($data2->entity, $data2->id, 'contentid', $data2->contentid);
   }
 }
 
@@ -3896,8 +3896,8 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
       'title' => 'unsure',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId', TRUE);
-    $this->assertResponseIDInForm('captchaId', TRUE);
+    $this->assertResponseIDInForm('contentid', TRUE);
+    $this->assertResponseIDInForm('captchaid', TRUE);
     $this->assertCaptchaField();
 
     $edit = array(
@@ -3922,21 +3922,21 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
       'title' => 'unsure',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId', TRUE);
-    $this->assertResponseIDInForm('captchaId', TRUE);
+    $this->assertResponseIDInForm('contentid', TRUE);
+    $this->assertResponseIDInForm('captchaid', TRUE);
     $this->assertCaptchaField();
 
     $edit = array();
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId');
-//    $this->assertResponseIDInForm('captchaId');
+    $this->assertResponseIDInForm('contentid');
+//    $this->assertResponseIDInForm('captchaid');
     $this->assertCaptchaField();
     $edit = array(
       'mollom[captcha]' => 'incorrect',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId');
-//    $this->assertResponseIDInForm('captchaId');
+    $this->assertResponseIDInForm('contentid');
+//    $this->assertResponseIDInForm('captchaid');
     $this->assertCaptchaField();
 
     $edit = array(
@@ -3960,21 +3960,21 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
       'body' => 'unsure',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId', TRUE);
-    $this->assertResponseIDInForm('captchaId', TRUE);
+    $this->assertResponseIDInForm('contentid', TRUE);
+    $this->assertResponseIDInForm('captchaid', TRUE);
     $this->assertCaptchaField();
     $edit = array(
       'body' => 'unsure unsure',
       'mollom[captcha]' => 'correct',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId');
+    $this->assertResponseIDInForm('contentid');
     $this->assertNoCaptchaField();
     $edit = array(
       'body' => 'unsure unsure unsure',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId');
+    $this->assertResponseIDInForm('contentid');
     $this->assertNoCaptchaField();
     $edit = array(
       'title' => 'unsure',
@@ -3996,8 +3996,8 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
       'body' => 'unsure',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId', TRUE);
-    $this->assertResponseIDInForm('captchaId', TRUE);
+    $this->assertResponseIDInForm('contentid', TRUE);
+    $this->assertResponseIDInForm('captchaid', TRUE);
     $this->assertCaptchaField();
     // Turn the post into ham.
     $edit = array(
@@ -4005,14 +4005,14 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
       'mollom[captcha]' => 'correct',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId');
+    $this->assertResponseIDInForm('contentid');
     $this->assertNoCaptchaField();
     // Turn the post back into unsure.
     $edit = array(
       'body' => 'unsure',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId');
+    $this->assertResponseIDInForm('contentid');
     $this->assertNoCaptchaField();
 
     $edit = array(
@@ -4036,15 +4036,15 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
       'body' => 'unsure',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId', TRUE);
-    $this->assertResponseIDInForm('captchaId', TRUE);
+    $this->assertResponseIDInForm('contentid', TRUE);
+    $this->assertResponseIDInForm('captchaid', TRUE);
     $this->assertCaptchaField();
 
     $edit = array(
       'mollom[captcha]' => 'correct',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId');
+    $this->assertResponseIDInForm('contentid');
     $this->assertNoCaptchaField();
 
     // Turn the post into spam.
@@ -4052,7 +4052,7 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
       'title' => 'spam',
     );
     $this->drupalPost(NULL, $edit, 'Submit');
-    $this->assertResponseIDInForm('contentId');
+    $this->assertResponseIDInForm('contentid');
     $this->assertNoCaptchaField();
     $this->assertText($this->spam_message);
     $this->assertNoText('Successful form submission.');
@@ -4601,7 +4601,7 @@ class MollomCaptchaTestCase extends MollomWebTestCase {
    */
   function subtestCAPTCHASwitchCallback() {
     // Verify that the CAPTCHA can be switched on a CAPTCHA-only protected form.
-    // (without having a contentId)
+    // (without having a contentid)
     $this->drupalGet('mollom-test/form');
     $form_build_id = $this->getFieldValueByName('form_build_id');
 
@@ -4620,7 +4620,7 @@ class MollomCaptchaTestCase extends MollomWebTestCase {
     $this->assertResponse(200);
     $this->assertText('mollom-captcha-player.swf');
     $response = drupal_json_decode($out);
-    $this->assertTrue($response['captchaId']);
+    $this->assertTrue($response['captchaid']);
   }
 }
 
@@ -5151,7 +5151,7 @@ class MollomModerationIntegrationTestCase extends MollomModerationBaseTestCase {
    */
   function testAuthorization() {
     $data = $this->drupalCreateTestPost();
-    $path = 'mollom/moderate/' . $data->contentId . '/spam';
+    $path = 'mollom/moderate/' . $data->contentid . '/spam';
 
     // Test no Mollom moderation access with disabled integration.
     $this->drupalLogin($this->admin_user);
@@ -5239,7 +5239,7 @@ class MollomModerationIntegrationTestCase extends MollomModerationBaseTestCase {
       $data = $this->drupalCreateTestPost();
 
       // Send a moderation request for the post.
-      $path = 'mollom/moderate/' . $data->contentId . '/' . $action;
+      $path = 'mollom/moderate/' . $data->contentid . '/' . $action;
       $this->mollomRequest('POST', $path);
 
       $record = mollom_test_load($data->id);
@@ -5319,7 +5319,7 @@ class MollomModerationIntegrationTestCase extends MollomModerationBaseTestCase {
       $posts[$node->nid] = $node;
 
       // Send a moderation request for the user.
-      $path = 'mollom/moderate/' . $data->contentId . '/' . $action;
+      $path = 'mollom/moderate/' . $data->contentid . '/' . $action;
       $this->mollomRequest('POST', $path);
 
       $account = user_load($data->id, TRUE);
@@ -5466,7 +5466,7 @@ class MollomModerationEntityTestCase extends MollomModerationBaseTestCase {
     $this->assertSame('contextTitle', $record['contextTitle'], $node->title);
 
     // Moderate the second comment.
-    $this->mollomRequest('POST', 'mollom/moderate/' . $comment2_data->contentId . '/delete');
+    $this->mollomRequest('POST', 'mollom/moderate/' . $comment2_data->contentid . '/delete');
     $this->assertResponse(200);
     $this->assertMollomWatchdogMessages();
     $this->assertFalse(comment_load($comment2->cid));
@@ -5474,7 +5474,7 @@ class MollomModerationEntityTestCase extends MollomModerationBaseTestCase {
     $this->assertSame('stored', $record['stored'], 0);
 
     // Moderate the node (which should also delete the first comment).
-    $this->mollomRequest('POST', 'mollom/moderate/' . $node_data->contentId . '/delete');
+    $this->mollomRequest('POST', 'mollom/moderate/' . $node_data->contentid . '/delete');
     $this->assertResponse(200);
     $this->assertMollomWatchdogMessages();
     $this->assertFalse(node_load($node->nid, NULL, TRUE));
@@ -5483,7 +5483,7 @@ class MollomModerationEntityTestCase extends MollomModerationBaseTestCase {
     $this->assertSame('stored', $record['stored'], 0);
 
     // Moderate the user.
-    $this->mollomRequest('POST', 'mollom/moderate/' . $account_data->contentId . '/delete');
+    $this->mollomRequest('POST', 'mollom/moderate/' . $account_data->contentid . '/delete');
     $this->assertResponse(200);
     $this->assertMollomWatchdogMessages();
     $this->assertFalse(user_load($account->uid, TRUE));
diff --git a/tests/mollom_test_server.module b/tests/mollom_test_server.module
index bbd041b..fadb580 100644
--- a/tests/mollom_test_server.module
+++ b/tests/mollom_test_server.module
@@ -282,22 +282,22 @@ function mollom_test_server_rest_site($publicKey = NULL, $delete = FALSE) {
 /**
  * REST callback for mollom.checkContent to perform textual analysis.
  */
-function mollom_test_server_rest_content($contentId = NULL) {
+function mollom_test_server_rest_content($contentid = NULL) {
   $data = mollom_test_server_rest_get_parameters();
   if ($_SERVER['REQUEST_METHOD'] == 'GET') {
     // @todo List/read content.
-    if (empty($contentId)) {
+    if (empty($contentid)) {
       return FALSE;
     }
     return FALSE;
   }
   else {
     // Content ID in request parameters must match the one in path.
-    if (isset($data['id']) && $data['id'] != $contentId) {
+    if (isset($data['id']) && $data['id'] != $contentid) {
       return FALSE;
     }
-    if (isset($contentId)) {
-      $data['id'] = $contentId;
+    if (isset($contentid)) {
+      $data['id'] = $contentid;
     }
   }
 
@@ -308,20 +308,20 @@ function mollom_test_server_rest_content($contentId = NULL) {
 /**
  * REST callback to for CAPTCHAs.
  */
-function mollom_test_server_rest_captcha($captchaId = NULL) {
+function mollom_test_server_rest_captcha($captchaid = NULL) {
   $data = mollom_test_server_rest_get_parameters();
   if ($_SERVER['REQUEST_METHOD'] == 'GET') {
-    // There is no GET /captcha[/{captchaId}].
+    // There is no GET /captcha[/{captchaid}].
     return FALSE;
   }
   else {
     // CAPTCHA ID in request parameters must match the one in path.
-    if (isset($data['id']) && $data['id'] != $captchaId) {
+    if (isset($data['id']) && $data['id'] != $captchaid) {
       return FALSE;
     }
     // Verify CAPTCHA.
-    if (isset($captchaId)) {
-      $data['id'] = $captchaId;
+    if (isset($captchaid)) {
+      $data['id'] = $captchaid;
       $response = mollom_test_server_check_captcha($data);
       if (!is_array($response)) {
         return $response;
@@ -429,7 +429,7 @@ function mollom_test_server_rest_blacklist($public_key, $entryId = NULL, $delete
 function mollom_test_server_rest_send_feedback() {
   $data = mollom_test_server_rest_get_parameters();
   // A resource ID is required.
-  if (empty($data['contentId']) && empty($data['captchaId'])) {
+  if (empty($data['contentid']) && empty($data['captchaid'])) {
     return 400;
   }
 
@@ -593,17 +593,17 @@ function mollom_test_server_check_content($data) {
   }
 
   $storage = variable_get('mollom_test_server_content', array());
-  $contentId = (!empty($data['id']) ? $data['id'] : md5(mt_rand()));
-  if (isset($storage[$contentId])) {
-    $storage[$contentId] = array_merge($storage[$contentId], $data);
+  $contentid = (!empty($data['id']) ? $data['id'] : md5(mt_rand()));
+  if (isset($storage[$contentid])) {
+    $storage[$contentid] = array_merge($storage[$contentid], $data);
   }
   else {
-    $storage[$contentId] = $data;
+    $storage[$contentid] = $data;
   }
   if ($update) {
-    $response = array_merge($storage[$contentId], $response);
+    $response = array_merge($storage[$contentid], $response);
   }
-  $response['id'] = $contentId;
+  $response['id'] = $contentid;
   variable_set('mollom_test_server_content', $storage);
 
   return $response;
@@ -635,9 +635,9 @@ function mollom_test_server_check_content_blacklist($string, $blacklist, $reason
  * API callback for mollom.getImageCaptcha to fetch a CAPTCHA image.
  */
 function mollom_test_server_get_captcha($data) {
-  $captchaId = (!empty($data['id']) ? $data['id'] : md5(mt_rand()));
+  $captchaid = (!empty($data['id']) ? $data['id'] : md5(mt_rand()));
   $response = array(
-    'id' => $captchaId,
+    'id' => $captchaid,
   );
 
   // Return a HTTPS URL if 'ssl' parameter was passed.
@@ -645,10 +645,10 @@ function mollom_test_server_get_captcha($data) {
   if (!empty($data['ssl'])) {
     $base_url = str_replace('http', 'https', $base_url);
   }
-  $response['url'] = $base_url . '/' . drupal_get_path('module', 'mollom') . '/images/powered-by-mollom-2.gif?captchaId=' . $captchaId;
+  $response['url'] = $base_url . '/' . drupal_get_path('module', 'mollom') . '/images/powered-by-mollom-2.gif?captchaid=' . $captchaid;
 
   $storage = variable_get('mollom_test_server_captcha', array());
-  $storage[$captchaId] = $data;
+  $storage[$captchaid] = $data;
   variable_set('mollom_test_server_captcha', $storage);
 
   return $response;
@@ -669,18 +669,18 @@ function mollom_test_server_check_captcha($data) {
   }
 
   $storage = variable_get('mollom_test_server_captcha', array());
-  $captchaId = $data['id'];
-  if (!isset($storage[$captchaId])) {
+  $captchaid = $data['id'];
+  if (!isset($storage[$captchaid])) {
     return MENU_NOT_FOUND;
   }
-  $storage[$captchaId] = array_merge($storage[$captchaId], $data);
-  $response['id'] = $captchaId;
+  $storage[$captchaid] = array_merge($storage[$captchaid], $data);
+  $response['id'] = $captchaid;
   variable_set('mollom_test_server_captcha', $storage);
 
-  if (isset($storage[$captchaId]['contentId'])) {
-    $contentId = $storage[$captchaId]['contentId'];
+  if (isset($storage[$captchaid]['contentid'])) {
+    $contentid = $storage[$captchaid]['contentid'];
     $content_captchas = variable_get('mollom_test_server_content_captcha', array());
-    $content_captchas[$contentId] = $response['solved'];
+    $content_captchas[$contentid] = $response['solved'];
     variable_set('mollom_test_server_content_captcha', $content_captchas);
   }