diff --git a/tests/data/bb_BB/test_bw_contact_form_bb_BB.html b/tests/data/bb_BB/test_bw_contact_form_bb_BB.html
index a5994f6..9e472c5 100644
--- a/tests/data/bb_BB/test_bw_contact_form_bb_BB.html
+++ b/tests/data/bb_BB/test_bw_contact_form_bb_BB.html
@@ -3,34 +3,34 @@
 <table>
 <tr>
 <td>
-<label for="oiku_name">Nmae *</label>
+<label for="oiku_contact-1_name">Nmae *</label>
 </td>
 <td>
-<input type="text" size="30" name="oiku_name" id="oiku_name" value="" class="textBox"required />
+<input type="text" size="30" name="oiku_contact-1_name" id="oiku_contact-1_name" value="" class="textBox"required />
 </td>
 </tr>
 <tr>
 <td>
-<label for="oiku_email">Eamil *</label>
+<label for="oiku_contact-1_email">Eamil *</label>
 </td>
 <td>
-<input type="email" name="oiku_email" size="30" class="textBox"required />
+<input type="email" name="oiku_contact-1_email" size="30" class="textBox"required />
 </td>
 </tr>
 <tr>
 <td>
-<label for="oiku_subject">Sbuejct</label>
+<label for="oiku_contact-1_subject">Sbuejct</label>
 </td>
 <td>
-<input type="text" size="30" name="oiku_subject" id="oiku_subject" value="" class="textBox" />
+<input type="text" size="30" name="oiku_contact-1_subject" id="oiku_contact-1_subject" value="" class="textBox" />
 </td>
 </tr>
 <tr>
 <td>
-<label for="oiku_text">Mseasge</label>
+<label for="oiku_contact-1_message">Mseasge</label>
 </td>
 <td>
-<textarea rows="10" cols="30" name="oiku_text">
+<textarea rows="10" cols="30" name="oiku_contact-1_message">
 </textarea>
 </td>
 </tr>
diff --git a/tests/data/en_GB/test_bw_contact_form.html b/tests/data/en_GB/test_bw_contact_form.html
index 8fe7b90..621f103 100644
--- a/tests/data/en_GB/test_bw_contact_form.html
+++ b/tests/data/en_GB/test_bw_contact_form.html
@@ -3,34 +3,34 @@
 <table>
 <tr>
 <td>
-<label for="oiku_name">Name *</label>
+<label for="oiku_contact-1_name">Name *</label>
 </td>
 <td>
-<input type="text" size="30" name="oiku_name" id="oiku_name" value="" class="textBox"required />
+<input type="text" size="30" name="oiku_contact-1_name" id="oiku_contact-1_name" value="" class="textBox"required />
 </td>
 </tr>
 <tr>
 <td>
-<label for="oiku_email">Email *</label>
+<label for="oiku_contact-1_email">Email *</label>
 </td>
 <td>
-<input type="email" name="oiku_email" size="30" class="textBox"required />
+<input type="email" name="oiku_contact-1_email" size="30" class="textBox"required />
 </td>
 </tr>
 <tr>
 <td>
-<label for="oiku_subject">Subject</label>
+<label for="oiku_contact-1_subject">Subject</label>
 </td>
 <td>
-<input type="text" size="30" name="oiku_subject" id="oiku_subject" value="" class="textBox" />
+<input type="text" size="30" name="oiku_contact-1_subject" id="oiku_contact-1_subject" value="" class="textBox" />
 </td>
 </tr>
 <tr>
 <td>
-<label for="oiku_text">Message</label>
+<label for="oiku_contact-1_message">Message</label>
 </td>
 <td>
-<textarea rows="10" cols="30" name="oiku_text">
+<textarea rows="10" cols="30" name="oiku_contact-1_message">
 </textarea>
 </td>
 </tr>