diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
index 1f99b9a994e..5c71cd02cf9 100644
--- a/application/controllers/RegisterController.php
+++ b/application/controllers/RegisterController.php
@@ -35,7 +35,7 @@ function actionAjaxregisterform($surveyid)
                       WHERE a.sid = $surveyid ";
 
 
-        $sresult = db_execute_assoc($squery) or show_error("Couldn't execute $squery");
+        $sresult = dbExecuteAssoc($squery) or show_error("Couldn't execute $squery");
 
 
         $row = $sresult->read();
@@ -69,7 +69,7 @@ function actionIndex($surveyid = null)
         }
 
         $usquery = "SELECT stg_value FROM {{settings_global}} where stg_name='SessionName'";
-        $usresult = db_execute_assoc($usquery,'',true);          //Checked
+        $usresult = dbExecuteAssoc($usquery,'',true);          //Checked
         if ($usresult->count() > 0)
         {
             $usrow = $usresult->read();
@@ -137,7 +137,7 @@ function actionIndex($surveyid = null)
         //Check if this email already exists in token database
         $query = "SELECT email FROM {{tokens_$surveyid}}\n"
         . "WHERE email = '".sanitize_email(Yii::app()->request->getPost('register_email'))."'";
-        $result = db_execute_assoc($query) or show_error("Unable to execute this query : \n <br/>".$query."<br />");   //Checked)
+        $result = dbExecuteAssoc($query) or show_error("Unable to execute this query : \n <br/>".$query."<br />");   //Checked)
         if (($result->count()) > 0)
         {
             $register_errormsg=$clang->gT("The email you used has already been registered.");
@@ -169,7 +169,7 @@ function actionIndex($surveyid = null)
         {
             $newtoken = randomChars($tokenlength);
             $ntquery = "SELECT * FROM {{tokens_$surveyid}} WHERE token='$newtoken'";
-            $ntresult = db_execute_assoc($ntquery); //Checked
+            $ntresult = dbExecuteAssoc($ntquery); //Checked
             if (!$ntresult->count()) {$mayinsert = true;}
         }
 
@@ -254,7 +254,7 @@ function actionIndex($surveyid = null)
             $today = dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i", Yii::app()->getConfig('timeadjust'));
             $query = "UPDATE {{tokens_$surveyid}}\n"
             ."SET sent='$today' WHERE tid=$tid";
-            $result=db_execute_assoc($query) or show_error("Unable to execute this query : $query<br />");     //Checked
+            $result=dbExecuteAssoc($query) or show_error("Unable to execute this query : $query<br />");     //Checked
             $html="<center>".$clang->gT("Thank you for registering to participate in this survey.")."<br /><br />\n".$clang->gT("An email has been sent to the address you provided with access details for this survey. Please follow the link in that email to proceed.")."<br /><br />\n".$clang->gT("Survey administrator")." {ADMINNAME} ({ADMINEMAIL})";
             $html=ReplaceFields($html, $fieldsarray);
             $html .= "<br /><br /></center>\n";
diff --git a/application/controllers/SurveyAction.php b/application/controllers/SurveyAction.php
index a0f8142a59d..75cdef7b819 100644
--- a/application/controllers/SurveyAction.php
+++ b/application/controllers/SurveyAction.php
@@ -169,7 +169,7 @@ function action()
             AND ((a.expires >= '".date("Y-m-d H:i")."') OR (a.expires is null))
             AND ((a.startdate <= '".date("Y-m-d H:i")."') OR (a.startdate is null))
             ORDER BY surveyls_title";
-            $result = db_execute_assoc($query,false,true) or safeDie("Could not connect to database. If you try to install LimeSurvey please refer to the <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage."); //Checked
+            $result = dbExecuteAssoc($query,false,true) or safeDie("Could not connect to database. If you try to install LimeSurvey please refer to the <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage."); //Checked
             $list=array();
 
             if($result->count() > 0)
@@ -202,7 +202,7 @@ function action()
             AND a.startdate is not null
             ORDER BY surveyls_title";
 
-            $sresult = db_execute_assoc($squery) or safeDie("Couldn't execute $squery");
+            $sresult = dbExecuteAssoc($squery) or safeDie("Couldn't execute $squery");
 
 
             if($sresult->count() > 0)
@@ -423,7 +423,7 @@ function sendreq(surveyid)
             } else {
                 $tkquery = "SELECT * FROM {{'tokens_'".$surveyid."}} WHERE token=".$token." AND (completed = 'N' or completed='')";
             }
-            $tkresult = db_execute_assoc($tkquery); //Checked
+            $tkresult = dbExecuteAssoc($tkquery); //Checked
             $tokendata = $tkresult->read();
             if ($tkresult->count()==0 || $areTokensUsed)
             {
@@ -443,7 +443,7 @@ function sendreq(surveyid)
                 $this->_niceExit($redata, __LINE__, $thistpl, $asMessage, true);
             }
         }
-        if ($tokensexist == 1 && isset($token) && $token && db_tables_exist("{{tokens_".$surveyid."}}")) //check if token is in a valid time frame
+        if ($tokensexist == 1 && isset($token) && $token && tableExists("{{tokens_".$surveyid."}}")) //check if token is in a valid time frame
         {
             // check also if it is allowed to change survey after completion
             if ($thissurvey['alloweditaftercompletion'] == 'Y' ) {
@@ -451,7 +451,7 @@ function sendreq(surveyid)
             } else {
                 $tkquery = "SELECT * FROM {{tokens_".$surveyid."}} WHERE token=".$token." AND (completed = 'N' or completed='')";
             }
-            $tkresult = db_execute_assoc($tkquery); //Checked
+            $tkresult = dbExecuteAssoc($tkquery); //Checked
             $tokendata = $tkresult->read();
             if (isset($tokendata['validfrom']) && (trim($tokendata['validfrom'])!='' && $tokendata['validfrom']>dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", $timeadjust)) ||
             isset($tokendata['validuntil']) && (trim($tokendata['validuntil'])!='' && $tokendata['validuntil']<dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", $timeadjust)))
@@ -497,7 +497,7 @@ function sendreq(surveyid)
                 if (isset($qid))
                 {
                     $query = "SELECT * FROM {{survey_".$surveyid."}} WHERE id=".$_SESSION['survey_'.$surveyid]['srid'];
-                    $result = db_execute_assoc($query);
+                    $result = dbExecuteAssoc($query);
                     foreach($result->readAll() as $row)
                     {
                         foreach ($qid as $question)
@@ -522,10 +522,10 @@ function sendreq(surveyid)
 
 
                 // delete the response but only if not already completed
-                db_execute_assoc('DELETE FROM {{survey_'.$surveyid.'}} WHERE id='.$_SESSION['survey_'.$surveyid]['srid']." AND submitdate IS NULL");
+                dbExecuteAssoc('DELETE FROM {{survey_'.$surveyid.'}} WHERE id='.$_SESSION['survey_'.$surveyid]['srid']." AND submitdate IS NULL");
 
                 // also delete a record from saved_control when there is one
-                db_execute_assoc('DELETE FROM {{saved_control}} WHERE srid='.$_SESSION['survey_'.$surveyid]['srid'].' AND sid='.$surveyid);
+                dbExecuteAssoc('DELETE FROM {{saved_control}} WHERE srid='.$_SESSION['survey_'.$surveyid]['srid'].' AND sid='.$surveyid);
             }
             killSurveySession($surveyid);
             sendCacheHeaders();
@@ -574,7 +574,7 @@ function sendreq(surveyid)
             $srquery="SELECT id FROM {$thissurvey['tablename']}"
             . " WHERE {$thissurvey['tablename']}.token='".$token."' order by id desc";
 
-            $result = db_select_limit_assoc($srquery,1);
+            $result = dbSelectLimitAssoc($srquery,1);
             if ($result->count()>0)
             {
                 $row=reset($result->read());
@@ -696,7 +696,7 @@ function _surveyExistsAndIsActive($surveyId)
 
         if ($surveyId)
         {
-            $aRow = db_execute_assoc("SELECT active FROM {{surveys}} WHERE sid='".$surveyId."'")->read();
+            $aRow = dbExecuteAssoc("SELECT active FROM {{surveys}} WHERE sid='".$surveyId."'")->read();
             if (isset($aRow['active']))
             {
                 $surveyExists = true;
@@ -745,7 +745,7 @@ function _canUserPreviewSurvey($iSurveyID)
         if ( $_SESSION['USER_RIGHT_SUPERADMIN'] == 1 )
             return true;
 
-        $rightresult = db_execute_assoc(
+        $rightresult = dbExecuteAssoc(
         "SELECT uid
         FROM {{survey_permissions}}
         WHERE sid = ".$iSurveyID."
diff --git a/application/controllers/admin/checkintegrity.php b/application/controllers/admin/checkintegrity.php
index 686177c20c6..f4d9ca319b3 100644
--- a/application/controllers/admin/checkintegrity.php
+++ b/application/controllers/admin/checkintegrity.php
@@ -339,8 +339,8 @@ protected function _checkintegrity()
 
         /*** Check for active survey tables with missing survey entry and rename them ***/
         $sDBPrefix = Yii::app()->db->tablePrefix;
-        $sQuery = db_select_tables_like('{{survey}}\_%');
-        $aResult = db_query_or_false($sQuery) or safeDie("Couldn't get list of conditions from database<br />{$sQuery}<br />");
+        $sQuery = dbSelectTablesLike('{{survey}}\_%');
+        $aResult = dbQueryOrFalse($sQuery) or safeDie("Couldn't get list of conditions from database<br />{$sQuery}<br />");
         foreach ($aResult->readAll() as $aRow)
         {
             $sTableName = substr(reset($aRow), strlen($sDBPrefix));
@@ -362,7 +362,7 @@ protected function _checkintegrity()
         }
 
         /*** Check for active token tables with missing survey entry ***/
-        $aResult = db_query_or_false(db_select_tables_like('{{tokens}}\_%')) or safeDie("Couldn't get list of conditions from database<br />{$sQuery}<br />");
+        $aResult = dbQueryOrFalse(dbSelectTablesLike('{{tokens}}\_%')) or safeDie("Couldn't get list of conditions from database<br />{$sQuery}<br />");
         foreach ($aResult->readAll() as $aRow)
         {
             $sTableName = substr(reset($aRow), strlen($sDBPrefix));
@@ -613,8 +613,8 @@ protected function _checkintegrity()
         //1: Get list of 'old_survey' tables and extract the survey id
         //2: Check if that survey id still exists
         //3: If it doesn't offer it for deletion
-        $sQuery = db_select_tables_like('{{old_survey}}%');
-        $aResult = db_query_or_false($sQuery) or safeDie("Couldn't get list of conditions from database<br />$sQuery<br />");
+        $sQuery = dbSelectTablesLike('{{old_survey}}%');
+        $aResult = dbQueryOrFalse($sQuery) or safeDie("Couldn't get list of conditions from database<br />$sQuery<br />");
         $aTables = $aResult->readAll();
 
         $aOldSIDs = array();
@@ -628,7 +628,7 @@ protected function _checkintegrity()
         }
         $aOldSIDs = array_unique($aOldSIDs);
         $sQuery = 'SELECT sid FROM {{surveys}} ORDER BY sid';
-        $oResult = db_execute_assoc($sQuery) or safeDie('Couldn\'t get unique survey ids');
+        $oResult = dbExecuteAssoc($sQuery) or safeDie('Couldn\'t get unique survey ids');
         $surveys = Survey::model()->findAll();
         if (Survey::model()->hasErrors()) safeDie(Survey::model()->getError());
         $aSIDs = array();
@@ -668,7 +668,7 @@ protected function _checkintegrity()
                     $iMinute = substr($sDateTime, 10, 2);
                     $sDate = date('d M Y  H:i', mktime($iHour, $iMinute, 0, $iMonth, $iDay, $iYear));
                     $sQuery = 'SELECT * FROM ' . $sTableName;
-                    $oQRresult = db_execute_assoc($sQuery) or safeDie('Failed: ' . $sQuery);
+                    $oQRresult = dbExecuteAssoc($sQuery) or safeDie('Failed: ' . $sQuery);
                     $iRecordcount = $oQRresult->count();
                     if ($iRecordcount == 0) { // empty table - so add it to immediate deletion
                         $aDelete['orphansurveytables'][] = $sTableName;
@@ -686,7 +686,7 @@ protected function _checkintegrity()
         //1: Get list of 'old_token' tables and extract the survey id
         //2: Check if that survey id still exists
         //3: If it doesn't offer it for deletion
-        $aResult = db_query_or_false(db_select_tables_like('{{old_token}}%')) or safeDie("Couldn't get list of conditions from database<br />$sQuery<br />");
+        $aResult = dbQueryOrFalse(dbSelectTablesLike('{{old_token}}%')) or safeDie("Couldn't get list of conditions from database<br />$sQuery<br />");
         $aTables = $aResult->readAll();
 
         $aOldTokenSIDs = array();
@@ -732,7 +732,7 @@ protected function _checkintegrity()
                     $sDate = date('D, d M Y  h:i a', mktime($iHour, $iMinute, 0, $iMonth, $iDay, $iYear));
                     $sQuery = 'SELECT * FROM ' . $sTableName;
 
-                    $oQRresult = db_execute_assoc($sQuery) or safeDie('Failed: ' . $sQuery);
+                    $oQRresult = dbExecuteAssoc($sQuery) or safeDie('Failed: ' . $sQuery);
                     $iRecordcount = $oQRresult->count();
                     if ($iRecordcount == 0) {
                         $aDelete['orphantokentables'][] = $sTableName;
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
index eafcd80b906..d01cda5a91e 100644
--- a/application/controllers/admin/dataentry.php
+++ b/application/controllers/admin/dataentry.php
@@ -142,7 +142,7 @@ private function _handleFileUpload($surveyid, $aData)
 
         $importcount = 0;
         $recordcount = 0;
-        $aFieldnames = array_map('db_quote_id', $aFieldnames);
+        $aFieldnames = array_map('dbQuoteID', $aFieldnames);
 
         // Find out which fields are datefields, these have to be null if the imported string is empty
         $fieldmap = createFieldMap($surveyid,'short',false,false,getBaseLanguageFromSurveyID($surveyid));
@@ -346,19 +346,19 @@ function import($surveyid)
             {
                 // show UI for choosing old table
 
-                $result = db_get_tables_like("old\_survey\_%");
+                $result = dbGetTablesLike("old\_survey\_%");
 
                 $optionElements_array = '';
                 //$queryCheckColumnsActive = $schema->getTable($oldtable)->columnNames;
                 $resultActive = $schema->getTable("{{survey_{$surveyid}}}")->columnNames;
-                //$resultActive = db_execute_assoc($queryCheckColumnsActive) or show_error("Error:<br />$query<br />");
+                //$resultActive = dbExecuteAssoc($queryCheckColumnsActive) or show_error("Error:<br />$query<br />");
                 $countActive = count($resultActive);
 
                 foreach ($result as $row)
                 {
                     $row = each($row);
 
-                    //$resultOld = db_execute_assoc($queryCheckColumnsOld) or show_error("Error:<br />$query<br />");
+                    //$resultOld = dbExecuteAssoc($queryCheckColumnsOld) or show_error("Error:<br />$query<br />");
                     $resultOld = $schema->getTable($row[1])->columnNames;
 
                     if($countActive == count($resultOld)) //num_fields()
@@ -405,8 +405,8 @@ function import($surveyid)
                 $aValidFields = array_diff($aValidFields, $dontimportfields);
 
 
-                $queryOldValues = "SELECT ".implode(", ",array_map("db_quote_id", $aValidFields))." FROM {$oldtable} ";
-                $resultOldValues = db_execute_assoc($queryOldValues) or show_error("Error:<br />$queryOldValues<br />");
+                $queryOldValues = "SELECT ".implode(", ",array_map("dbQuoteID", $aValidFields))." FROM {$oldtable} ";
+                $resultOldValues = dbExecuteAssoc($queryOldValues) or show_error("Error:<br />$queryOldValues<br />");
                 $iRecordCount = $resultOldValues->count();
                 $aSRIDConversions=array();
                 foreach ($resultOldValues->readAll() as $row)
@@ -415,8 +415,8 @@ function import($surveyid)
                     unset($row['id']);
 
                     //$sInsertSQL=Yii::app()->db->GetInsertSQL($activetable, $row);
-                    $sInsertSQL="INSERT into {$activetable} (".implode(",", array_map("db_quote_id", array_keys($row))).") VALUES (".implode(",", array_map("dbQuoteAll",array_values($row))).")";
-                    $result = db_execute_assoc($sInsertSQL) or show_error("Error:<br />$sInsertSQL<br />");
+                    $sInsertSQL="INSERT into {$activetable} (".implode(",", array_map("dbQuoteID", array_keys($row))).") VALUES (".implode(",", array_map("dbQuoteAll",array_values($row))).")";
+                    $result = dbExecuteAssoc($sInsertSQL) or show_error("Error:<br />$sInsertSQL<br />");
                     $aSRIDConversions[$iOldID]=Yii::app()->db->getLastInsertID();
                 }
 
@@ -434,7 +434,7 @@ function import($surveyid)
                     $aValidTimingFields=array_intersect($aFieldsOldTimingTable,$aFieldsNewTimingTable);
 
                     $queryOldValues = "SELECT ".implode(", ",$aValidTimingFields)." FROM {$sOldTimingsTable} ";
-                    $resultOldValues = db_execute_assoc($queryOldValues) or show_error("Error:<br />$queryOldValues<br />");
+                    $resultOldValues = dbExecuteAssoc($queryOldValues) or show_error("Error:<br />$queryOldValues<br />");
                     $iRecordCountT=$resultOldValues->count();
                     $aSRIDConversions=array();
                     foreach ($resultOldValues->readAll() as $row)
@@ -445,8 +445,8 @@ function import($surveyid)
                         }
                         else continue;
                         //$sInsertSQL=Yii::app()->db->GetInsertSQL($sNewTimingsTable,$row);
-                        $sInsertSQL="INSERT into {$sNewTimingsTable} (".implode(",", array_map("db_quote_id", array_keys($row))).") VALUES (".implode(",", array_map("dbQuoteAll", array_values($row))).")";
-                        $result = db_execute_assoc($sInsertSQL) or show_error("Error:<br />$sInsertSQL<br />");
+                        $sInsertSQL="INSERT into {$sNewTimingsTable} (".implode(",", array_map("dbQuoteID", array_keys($row))).") VALUES (".implode(",", array_map("dbQuoteAll", array_values($row))).")";
+                        $result = dbExecuteAssoc($sInsertSQL) or show_error("Error:<br />$sInsertSQL<br />");
                     }
                     Yii::app()->session['flashmessage'] = sprintf($clang->gT("%s old response(s) and according timings were successfully imported."),$iRecordCount,$iRecordCountT);
                 }
@@ -498,7 +498,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
             {{questions}}.language = '{$sDataEntryLanguage}' AND g.language = '{$sDataEntryLanguage}' AND
             {{questions}}.sid={{surveys}}.sid AND {{questions}}.sid='$surveyid'
             order by group_order, question_order";
-            $fnresult = db_execute_assoc($fnquery);
+            $fnresult = dbExecuteAssoc($fnquery);
 
             $fncount = $fnresult->getRowCount();
 
@@ -525,7 +525,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
             if ($subaction == "edit" && hasSurveyPermission($surveyid,'responses','update'))
             {
                 $idquery = "SELECT * FROM $surveytable WHERE id=$id";
-                $idresult = db_execute_assoc($idquery) or safeDie ("Couldn't get individual record<br />$idquery<br />");
+                $idresult = dbExecuteAssoc($idquery) or safeDie ("Couldn't get individual record<br />$idquery<br />");
                 foreach ($idresult->readAll() as $idrow)
                 {
                     $results[]=$idrow;
@@ -743,7 +743,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                             else
                             {
                                 $lquery = "SELECT * FROM {{answers}} WHERE qid={$fname['qid']} AND language = '{$sDataEntryLanguage}' ORDER BY sortorder, answer";
-                                $lresult = db_execute_assoc($lquery);
+                                $lresult = dbExecuteAssoc($lquery);
                                 $aDataentryoutput .= "\t<select name='{$fname['fieldname']}'>\n"
                                 ."<option value=''";
                                 if ($idrow[$fname['fieldname']] == "") {$aDataentryoutput .= " selected='selected'";}
@@ -796,7 +796,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                                 }
 
                                 $oquery="SELECT other FROM {{questions}} WHERE qid={$fname['qid']} AND {{questions}}.language = '{$sDataEntryLanguage}'";
-                                $oresult=db_execute_assoc($oquery) or safeDie("Couldn't get other for list question<br />".$oquery."<br />");
+                                $oresult=dbExecuteAssoc($oquery) or safeDie("Couldn't get other for list question<br />".$oquery."<br />");
                                 foreach($oresult->readAll() as $orow)
                                 {
                                     $fother=$orow['other'];
@@ -812,7 +812,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                             break;
                         case "O": //LIST WITH COMMENT drop-down/radio-button list + textarea
                             $lquery = "SELECT * FROM {{answers}} WHERE qid={$fname['qid']} AND language = '{$sDataEntryLanguage}' ORDER BY sortorder, answer";
-                            $lresult = db_execute_assoc($lquery);
+                            $lresult = dbExecuteAssoc($lquery);
                             $aDataentryoutput .= "\t<select name='{$fname['fieldname']}'>\n"
                             ."<option value=''";
                             if ($idrow[$fname['fieldname']] == "") {$aDataentryoutput .= " selected='selected'";}
@@ -844,7 +844,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                                 $fname=next($fnames);
                             }
                             $ansquery = "SELECT * FROM {{answers}} WHERE language = '{$sDataEntryLanguage}' AND qid=$thisqid ORDER BY sortorder, answer";
-                            $ansresult = db_execute_assoc($ansquery);
+                            $ansresult = dbExecuteAssoc($ansquery);
                             $anscount = $ansresult->count();
                             $aDataentryoutput .= "\t<script type='text/javascript'>\n"
                             ."\t<!--\n"
@@ -1029,7 +1029,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
 
                         case "I": //Language Switch
                             $lquery = "SELECT * FROM {{answers}} WHERE qid={$fname['qid']} AND language = '{$sDataEntryLanguage}' ORDER BY sortorder, answer";
-                            $lresult = db_execute_assoc($lquery);
+                            $lresult = dbExecuteAssoc($lquery);
 
 
                             $slangs = Survey::model()->findByPk($surveyid)->additionalLanguages;
@@ -1276,7 +1276,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                                 $scale_id=0;
                                 if (isset($fname['scale_id'])) $scale_id=$fname['scale_id'];
                                 $fquery = "SELECT * FROM {{answers}} WHERE qid='{$fname['qid']}' and scale_id={$scale_id} and language='$sDataEntryLanguage' order by sortorder, answer";
-                                $fresult = db_execute_assoc($fquery);
+                                $fresult = dbExecuteAssoc($fquery);
                                 $aDataentryoutput .= "<td>\n";
                                 foreach ($fresult->readAll() as $frow)
                                 {
@@ -1439,7 +1439,7 @@ public function delete()
 
             $delquery = "DELETE FROM $surveytable WHERE id=$id";
             Yii::app()->loadHelper('database');
-            $delresult = db_execute_assoc($delquery) or safeDie ("Couldn't delete record $id<br />\n");
+            $delresult = dbExecuteAssoc($delquery) or safeDie ("Couldn't delete record $id<br />\n");
 
             $this->_renderWrappedTemplate('delete', $aData);
         }
@@ -1503,7 +1503,7 @@ public function update()
                 {
                     if ($thisvalue == "")
                     {
-                        $updateqr .= $fieldname." = NULL, \n"; //db_quote_id($fieldname)." = NULL, \n";
+                        $updateqr .= $fieldname." = NULL, \n"; //dbQuoteID($fieldname)." = NULL, \n";
                     }
                     else
                     {
@@ -1516,41 +1516,41 @@ public function update()
                         //need to check if library get initialized with new value of constructor or not.
 
                         //$datetimeobj = new Date_Time_Converter($thisvalue,$dateformatdetails['phpdate']);
-                        $updateqr .= $fieldname." = '{$datetimeobj->convert("Y-m-d H:i:s")}', \n";// db_quote_id($fieldname)." = '{$datetimeobj->convert("Y-m-d H:i:s")}', \n";
+                        $updateqr .= $fieldname." = '{$datetimeobj->convert("Y-m-d H:i:s")}', \n";// dbQuoteID($fieldname)." = '{$datetimeobj->convert("Y-m-d H:i:s")}', \n";
                     }
                 }
                 elseif (($irow['type'] == 'N' || $irow['type'] == 'K') && $thisvalue == "")
                 {
-                    $updateqr .= $fieldname." = NULL, \n"; //db_quote_id($fieldname)." = NULL, \n";
+                    $updateqr .= $fieldname." = NULL, \n"; //dbQuoteID($fieldname)." = NULL, \n";
                 }
                 elseif ($irow['type'] == '|' && strpos($irow['fieldname'], '_filecount') && $thisvalue == "")
                 {
-                    $updateqr .= $fieldname." = NULL, \n"; //db_quote_id($fieldname)." = NULL, \n";
+                    $updateqr .= $fieldname." = NULL, \n"; //dbQuoteID($fieldname)." = NULL, \n";
                 }
                 elseif ($irow['type'] == 'submitdate')
                 {
                     if (isset($_POST['completed']) && ($_POST['completed']== "N"))
                     {
-                        $updateqr .= $fieldname." = NULL, \n"; //db_quote_id($fieldname)." = NULL, \n";
+                        $updateqr .= $fieldname." = NULL, \n"; //dbQuoteID($fieldname)." = NULL, \n";
                     }
                     elseif (isset($_POST['completed']) && $thisvalue=="")
                     {
-                        $updateqr .= $fieldname." = '" . $_POST['completed'] . "', \n";// db_quote_id($fieldname)." = " . dbQuoteAll($_POST['completed'],true) . ", \n";
+                        $updateqr .= $fieldname." = '" . $_POST['completed'] . "', \n";// dbQuoteID($fieldname)." = " . dbQuoteAll($_POST['completed'],true) . ", \n";
                     }
                     else
                     {
-                        $updateqr .= $fieldname." = '" . $thisvalue . "', \n"; //db_quote_id($fieldname)." = " . dbQuoteAll($thisvalue,true) . ", \n";
+                        $updateqr .= $fieldname." = '" . $thisvalue . "', \n"; //dbQuoteID($fieldname)." = " . dbQuoteAll($thisvalue,true) . ", \n";
                     }
                 }
                 else
                 {
-                    $updateqr .= $fieldname." = '" . $thisvalue . "', \n"; // db_quote_id($fieldname)." = " . dbQuoteAll($thisvalue,true) . ", \n";
+                    $updateqr .= $fieldname." = '" . $thisvalue . "', \n"; // dbQuoteID($fieldname)." = " . dbQuoteAll($thisvalue,true) . ", \n";
                 }
             }
             $updateqr = substr($updateqr, 0, -3);
             $updateqr .= " WHERE id=$id";
 
-            $updateres = db_execute_assoc($updateqr) or safeDie("Update failed:<br />\n<br />$updateqr");
+            $updateres = dbExecuteAssoc($updateqr) or safeDie("Update failed:<br />\n<br />$updateqr");
             while (ob_get_level() > 0) {
                 ob_end_flush();
             }
@@ -1608,7 +1608,7 @@ public function insert()
                 {
                     $tokencompleted = "";
                     $tcquery = "SELECT completed from {{tokens_{$surveyid}}} WHERE token='{$_POST['token']}'"; //dbQuoteAll($_POST['token'],true);
-                    $tcresult = db_execute_assoc($tcquery);
+                    $tcresult = dbExecuteAssoc($tcquery);
                     $tccount = $tcresult->getRowCount();
                     foreach ($tcresult->readAll() as $tcrow)
                     {
@@ -1629,7 +1629,7 @@ public function insert()
                     else
                     { // token is valid, survey not anonymous, try to get last recorded response id
                         $aquery = "SELECT id,startlanguage FROM $surveytable WHERE token='".$_POST['token']."'"; //dbQuoteAll($_POST['token'],true);
-                        $aresult = db_execute_assoc($aquery);
+                        $aresult = dbExecuteAssoc($aquery);
                         foreach ($aresult->readAll() as $arow)
                         {
                             if ($tokencompleted != "N") { $lastanswfortoken=$arow['id']; }
@@ -1804,7 +1804,7 @@ public function insert()
 
                         // check how many uses the token has left
                         $usesquery = "SELECT usesleft FROM {{tokens_}}$surveyid WHERE token='".$_POST['token']."'";
-                        $usesresult = db_execute_assoc($usesquery);
+                        $usesresult = dbExecuteAssoc($usesquery);
                         $usesrow = $usesresult->readAll(); //$usesresult->row_array()
                         if (isset($usesrow)) { $usesleft = $usesrow[0]['usesleft']; }
 
@@ -1833,12 +1833,12 @@ public function insert()
                             }
                         }
                         $utquery .= "WHERE token='".$_POST['token']."'";
-                        $utresult = db_execute_assoc($utquery); //Yii::app()->db->Execute($utquery) or safeDie ("Couldn't update tokens table!<br />\n$utquery<br />\n".Yii::app()->db->ErrorMsg());
+                        $utresult = dbExecuteAssoc($utquery); //Yii::app()->db->Execute($utquery) or safeDie ("Couldn't update tokens table!<br />\n$utquery<br />\n".Yii::app()->db->ErrorMsg());
 
                         // save submitdate into survey table
                         $srid = Yii::app()->db->getLastInsertID(); // Yii::app()->db->getLastInsertID();
                         $sdquery = "UPDATE {{survey_$surveyid}} SET submitdate='".$submitdate."' WHERE id={$srid}\n";
-                        $sdresult = db_execute_assoc($sdquery) or safeDie ("Couldn't set submitdate response in survey table!<br />\n$sdquery<br />\n");
+                        $sdresult = dbExecuteAssoc($sdquery) or safeDie ("Couldn't set submitdate response in survey table!<br />\n$sdquery<br />\n");
                         $last_db_id = Yii::app()->db->getLastInsertID();
                     }
                     if (isset($_POST['save']) && $_POST['save'] == "on")
@@ -1871,7 +1871,7 @@ public function insert()
                         "status"=>"S",
                         "saved_date"=>dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", Yii::app()->getConfig('timeadjust')));
                         $this->load->model('saved_control_model');*/
-                        if (db_execute_assoc($SQL))
+                        if (dbExecuteAssoc($SQL))
                         {
                             $scid =  Yii::app()->db->getLastInsertID(); // Yii::app()->db->getLastInsertID("{{saved_control}}","scid");
 
@@ -1883,7 +1883,7 @@ public function insert()
                             if (tableExists($tokens_table)) //If the query fails, assume no tokens table exists
                             {
                                 $tkquery = "SELECT * FROM {$tokens_table}";
-                                $tkresult = db_execute_assoc($tkquery);
+                                $tkresult = dbExecuteAssoc($tkquery);
                                 /*$tokendata = array (
                                 "firstname"=> $saver['identifier'],
                                 "lastname"=> $saver['identifier'],
@@ -1903,7 +1903,7 @@ public function insert()
                                 VALUES
                                 (".implode(',',$values).")";
                                 //$this->tokens_dynamic_model->insertToken($surveyid,$tokendata);
-                                db_execute_assoc($SQL);
+                                dbExecuteAssoc($SQL);
                                 //Yii::app()->db->AutoExecute(db_table_name("tokens_".$surveyid), $tokendata,'INSERT');
                                 $aDataentrymsgs[] = CHtml::tag('font', array('class'=>'successtitle'), $clang->gT("A token entry for the saved survey has been created too."));
                                 //$aDataentryoutput .= "<font class='successtitle'></font><br />\n";
@@ -2009,7 +2009,7 @@ public function view($surveyid, $lang=NULL)
 
             // SURVEY NAME AND DESCRIPTION TO GO HERE
             $degquery = "SELECT * FROM {{groups}} WHERE sid=$surveyid AND language='{$sDataEntryLanguage}' ORDER BY {{groups}}.group_order";
-            $degresult = db_execute_assoc($degquery);
+            $degresult = dbExecuteAssoc($degquery);
             // GROUP NAME
             $aDataentryoutput = '';
 
@@ -2018,7 +2018,7 @@ public function view($surveyid, $lang=NULL)
                 LimeExpressionManager::StartProcessingGroup($degrow['gid'], ($thissurvey['anonymized']!="N"),$surveyid);
 
                 $deqquery = "SELECT * FROM {{questions}} WHERE sid=$surveyid AND parent_qid=0 AND gid={$degrow['gid']} AND language='{$sDataEntryLanguage}'";
-                $deqrows = (array) db_execute_assoc($deqquery)->readAll();
+                $deqrows = (array) dbExecuteAssoc($deqquery)->readAll();
                 $aDataentryoutput .= "\t<tr>\n"
                 ."<td colspan='3' align='center'><strong>".flattenText($degrow['group_name'],true)."</strong></td>\n"
                 ."\t</tr>\n";
@@ -2043,7 +2043,7 @@ public function view($surveyid, $lang=NULL)
 //                    $explanation = ""; //reset conditions explanation
 //                    $s=0;
 //                    $scenarioquery="SELECT DISTINCT scenario FROM {{conditions}} WHERE {{conditions}}.qid={$deqrow['qid']} ORDER BY scenario";
-//                    $scenarioresult=db_execute_assoc($scenarioquery);
+//                    $scenarioresult=dbExecuteAssoc($scenarioquery);
 //
 //                    foreach ($scenarioresult->readAll() as $scenariorow)
 //                    {
@@ -2052,13 +2052,13 @@ public function view($surveyid, $lang=NULL)
 //
 //                        $x=0;
 //                        $distinctquery="SELECT DISTINCT cqid, {{questions}}.title FROM {{conditions}}, {{questions}} WHERE {{conditions}}.cqid={{questions}}.qid AND {{conditions}}.qid={$deqrow['qid']} AND {{conditions}}.scenario={$scenariorow['scenario']} ORDER BY cqid";
-//                        $distinctresult=db_execute_assoc($distinctquery);
+//                        $distinctresult=dbExecuteAssoc($distinctquery);
 //
 //                        foreach ($distinctresult->readAll() as $distinctrow)
 //                        {
 //                            if ($x > 0) {$explanation .= " <i>".$blang->gT("AND")."</i><br />";}
 //                            $conquery="SELECT cid, cqid, cfieldname, {{questions}}.title, {{questions}}.question, value, {{questions}}.type, method FROM {{conditions}}, {{questions}} WHERE {{conditions}}.cqid={{questions}}.qid AND {{conditions}}.cqid={$distinctrow['cqid']} AND {{conditions}}.qid={$deqrow['qid']} AND {{conditions}}.scenario={$scenariorow['scenario']}";
-//                            $conresult=db_execute_assoc($conquery);
+//                            $conresult=dbExecuteAssoc($conquery);
 //                            foreach ($conresult->readAll() as $conrow)
 //                            {
 //                                if ($conrow['method']=="==") {$conrow['method']="= ";} else {$conrow['method']=$conrow['method']." ";}
@@ -2095,7 +2095,7 @@ public function view($surveyid, $lang=NULL)
 //                                        $fquery = "SELECT * FROM {{labels}}"
 //                                        . "WHERE lid='{$conrow['lid']}'\n and language='$sDataEntryLanguage' "
 //                                        . "AND code='{$conrow['value']}'";
-//                                        $fresult=db_execute_assoc($fquery) or safeDie("$fquery<br />Failed to execute this command in Data entry controller");
+//                                        $fresult=dbExecuteAssoc($fquery) or safeDie("$fquery<br />Failed to execute this command in Data entry controller");
 //                                        foreach($fresult->readAll() as $frow)
 //                                        {
 //                                            $postans=$frow['title'];
@@ -2118,7 +2118,7 @@ public function view($surveyid, $lang=NULL)
 //                                        $fquery = "SELECT * FROM {{questions}} "
 //                                        . "WHERE qid='{$conrow['cqid']}'\n and language='$sDataEntryLanguage' "
 //                                        . "AND title='{$conrow['title']}' and scale_id=0";
-//                                        $fresult=db_execute_assoc($fquery) or safeDie("$fquery<br />Failed to execute this command in Data Entry controller.");
+//                                        $fresult=dbExecuteAssoc($fquery) or safeDie("$fquery<br />Failed to execute this command in Data Entry controller.");
 //                                        if ($fresult->getRowCount() <= 0) die($fquery);
 //                                        foreach($fresult->readAll() as $frow)
 //                                        {
@@ -2133,7 +2133,7 @@ public function view($surveyid, $lang=NULL)
 //
 //                                    case "1":
 //                                        $ansquery="SELECT answer FROM {{answers}} WHERE qid='{$conrow['cqid']}' AND code='{$conrow['value']}' AND language='{$baselang}'";
-//                                        $ansresult=db_execute_assoc($ansquery);
+//                                        $ansresult=dbExecuteAssoc($ansquery);
 //                                        foreach ($ansresult->readAll() as $ansrow)
 //                                        {
 //                                            $conditions[]=$conrow['method']."'".$ansrow['answer']."'";
@@ -2152,7 +2152,7 @@ public function view($surveyid, $lang=NULL)
 //                                    case ";":
 //                                        $thiscquestion=$fieldmap[$conrow['cfieldname']];
 //                                        $ansquery="SELECT answer FROM {{answers}} WHERE qid='{$conrow['cqid']}' AND code='{$thiscquestion['aid']}' AND language='{$sDataEntryLanguage}'";
-//                                        $ansresult=db_execute_assoc($ansquery);
+//                                        $ansresult=dbExecuteAssoc($ansquery);
 //                                        $i=0;
 //                                        foreach ($ansresult->readAll() as $ansrow)
 //                                        {
@@ -2165,7 +2165,7 @@ public function view($surveyid, $lang=NULL)
 //                                        break;
 //                                    default:
 //                                        $ansquery="SELECT answer FROM {{answers}} WHERE qid='{$conrow['cqid']}' AND code='{$conrow['value']}' AND language='{$sDataEntryLanguage}'";
-//                                        $ansresult=db_execute_assoc($ansquery);
+//                                        $ansresult=dbExecuteAssoc($ansquery);
 //                                        foreach ($ansresult->readAll() as $ansrow)
 //                                        {
 //                                            $conditions[]=$conrow['method']."'".$ansrow['answer']."'";
@@ -2252,19 +2252,19 @@ public function view($surveyid, $lang=NULL)
                         case "Q": //MULTIPLE SHORT TEXT
                         case "K":
                             $deaquery = "SELECT question,title FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $dearesult = db_execute_assoc($deaquery);
+                            $dearesult = dbExecuteAssoc($deaquery);
                             $cdata['dearesult'] = $dearesult->readAll();
 
                             break;
 
                         case "1": // multi scale^
                             $deaquery = "SELECT * FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$baselang}' ORDER BY question_order";
-                            $dearesult = db_execute_assoc($deaquery);
+                            $dearesult = dbExecuteAssoc($deaquery);
 
                             $cdata['dearesult'] = $dearesult->readAll();
 
                             $oquery="SELECT other FROM {{questions}} WHERE qid={$deqrow['qid']} AND language='{$baselang}'";
-                            $oresult=db_execute_assoc($oquery) or safeDie("Couldn't get other for list question<br />".$oquery);
+                            $oresult=dbExecuteAssoc($oquery) or safeDie("Couldn't get other for list question<br />".$oquery);
                             foreach($oresult->readAll() as $orow)
                             {
                                 $cdata['fother']=$orow['other'];
@@ -2285,7 +2285,7 @@ public function view($surveyid, $lang=NULL)
                             }
                             $defexists="";
                             $deaquery = "SELECT * FROM {{answers}} WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY sortorder, answer";
-                            $dearesult = db_execute_assoc($deaquery);
+                            $dearesult = dbExecuteAssoc($deaquery);
                             //$aDataentryoutput .= "\t<select name='$fieldname'>\n";
                             $aDatatemp='';
                             if (!isset($optCategorySeparator))
@@ -2334,7 +2334,7 @@ public function view($surveyid, $lang=NULL)
                             }
 
                             $oquery="SELECT other FROM {{questions}} WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}'";
-                            $oresult=db_execute_assoc($oquery) or safeDie("Couldn't get other for list question<br />");
+                            $oresult=dbExecuteAssoc($oquery) or safeDie("Couldn't get other for list question<br />");
                             foreach($oresult->readAll() as $orow)
                             {
                                 $fother=$orow['other'];
@@ -2348,7 +2348,7 @@ public function view($surveyid, $lang=NULL)
                         case "O": //LIST WITH COMMENT drop-down/radio-button list + textarea
                             $defexists="";
                             $deaquery = "SELECT * FROM {{answers}} WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY sortorder, answer";
-                            $dearesult = db_execute_assoc($deaquery);
+                            $dearesult = dbExecuteAssoc($deaquery);
                             //$aDataentryoutput .= "\t<select name='$fieldname'>\n";
                             $aDatatemp='';
                             foreach ($dearesult->readAll() as $dearow)
@@ -2366,7 +2366,7 @@ public function view($surveyid, $lang=NULL)
                         case "R": //RANKING TYPE QUESTION
                             $thisqid=$deqrow['qid'];
                             $ansquery = "SELECT * FROM {{answers}} WHERE qid=$thisqid AND language='{$sDataEntryLanguage}' ORDER BY sortorder, answer";
-                            $ansresult = db_execute_assoc($ansquery);
+                            $ansresult = dbExecuteAssoc($ansquery);
                             $anscount = $ansresult->getRowCount();
 
                             $cdata['thisqid'] = $thisqid;
@@ -2460,7 +2460,7 @@ public function view($surveyid, $lang=NULL)
                                 $dcols=0;
                             }
                             $meaquery = "SELECT title, question FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $mearesult = db_execute_assoc($meaquery);
+                            $mearesult = dbExecuteAssoc($meaquery);
                             $meacount = $mearesult->getRowCount();
 
                             $cdata['dcols'] = $dcols;
@@ -2478,7 +2478,7 @@ public function view($surveyid, $lang=NULL)
                         case "P": //Multiple choice with comments checkbox + text
                             //$aDataentryoutput .= "<table border='0'>\n";
                             $meaquery = "SELECT * FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order, question";
-                            $mearesult = db_execute_assoc($meaquery);
+                            $mearesult = dbExecuteAssoc($meaquery);
 
                             $cdata['mearesult'] = $mearesult->readAll();
 
@@ -2493,25 +2493,25 @@ public function view($surveyid, $lang=NULL)
                             break;
                         case "A": //ARRAY (5 POINT CHOICE) radio-buttons
                             $meaquery = "SELECT title, question FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $mearesult = db_execute_assoc($meaquery);
+                            $mearesult = dbExecuteAssoc($meaquery);
 
                             $cdata['mearesult'] = $mearesult->readAll();
 
                             break;
                         case "B": //ARRAY (10 POINT CHOICE) radio-buttons
                             $meaquery = "SELECT title, question FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $mearesult = db_execute_assoc($meaquery);
+                            $mearesult = dbExecuteAssoc($meaquery);
                             $cdata['mearesult'] = $mearesult->readAll();
 
                         case "C": //ARRAY (YES/UNCERTAIN/NO) radio-buttons
                             $meaquery = "SELECT title, question FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $mearesult=db_execute_assoc($meaquery);
+                            $mearesult=dbExecuteAssoc($meaquery);
                             $cdata['mearesult'] = $mearesult->readAll();
 
                             break;
                         case "E": //ARRAY (YES/UNCERTAIN/NO) radio-buttons
                             $meaquery = "SELECT title, question FROM {{questions}} WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $mearesult=db_execute_assoc($meaquery) or safeDie ("Couldn't get answers, Type \"E\"<br />$meaquery<br />");
+                            $mearesult=dbExecuteAssoc($meaquery) or safeDie ("Couldn't get answers, Type \"E\"<br />$meaquery<br />");
                             $cdata['mearesult'] = $mearesult->readAll();
 
                             break;
@@ -2552,22 +2552,22 @@ public function view($surveyid, $lang=NULL)
                             $cdata['stepvalue'] = $stepvalue;
 
                             $lquery = "SELECT question, title FROM {{questions}} WHERE parent_qid={$deqrow['qid']} and scale_id=1 and language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $lresult=db_execute_assoc($lquery) or die ("Couldn't get labels, Type \":\"<br />$lquery<br />");
+                            $lresult=dbExecuteAssoc($lquery) or die ("Couldn't get labels, Type \":\"<br />$lquery<br />");
                             $cdata['lresult'] = $lresult->readAll();
 
                             $meaquery = "SELECT question, title FROM {{questions}} WHERE parent_qid={$deqrow['qid']} and scale_id=0 and language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $mearesult=db_execute_assoc($meaquery) or die ("Couldn't get answers, Type \":\"<br />$meaquery<br />");
+                            $mearesult=dbExecuteAssoc($meaquery) or die ("Couldn't get answers, Type \":\"<br />$meaquery<br />");
                             $cdata['mearesult'] = $mearesult->readAll();
 
                             break;
                         case ";": //ARRAY (Multi Flexi)
 
                             $lquery = "SELECT * FROM {{questions}} WHERE scale_id=1 and parent_qid={$deqrow['qid']} and language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $lresult=db_execute_assoc($lquery) or die ("Couldn't get labels, Type \":\"<br />$lquery<br />");
+                            $lresult=dbExecuteAssoc($lquery) or die ("Couldn't get labels, Type \":\"<br />$lquery<br />");
                             $cdata['lresult'] = $lresult->readAll();
 
                             $meaquery = "SELECT * FROM {{questions}} WHERE scale_id=0 and parent_qid={$deqrow['qid']} and language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $mearesult=db_execute_assoc($meaquery) or die ("Couldn't get answers, Type \":\"<br />$meaquery<br />");
+                            $mearesult=dbExecuteAssoc($meaquery) or die ("Couldn't get answers, Type \":\"<br />$meaquery<br />");
 
                             $cdata['mearesult'] = $mearesult->readAll();
 
@@ -2575,12 +2575,12 @@ public function view($surveyid, $lang=NULL)
                         case "F": //ARRAY (Flexible Labels)
                         case "H":
                             $meaquery = "SELECT * FROM {{questions}} WHERE parent_qid={$deqrow['qid']} and language='{$sDataEntryLanguage}' ORDER BY question_order";
-                            $mearesult=db_execute_assoc($meaquery) or safeDie ("Couldn't get answers, Type \"E\"<br />$meaquery<br />");
+                            $mearesult=dbExecuteAssoc($meaquery) or safeDie ("Couldn't get answers, Type \"E\"<br />$meaquery<br />");
 
                             $cdata['mearesult'] = $mearesult->readAll();
 
                             $fquery = "SELECT * FROM {{answers}} WHERE qid={$deqrow['qid']} and language='{$sDataEntryLanguage}' ORDER BY sortorder, code";
-                            $fresult = db_execute_assoc($fquery);
+                            $fresult = dbExecuteAssoc($fquery);
                             $cdata['fresult'] = $fresult->readAll();
                             break;
                     }
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
index c1926783204..f8efdcb9fd9 100644
--- a/application/controllers/admin/export.php
+++ b/application/controllers/admin/export.php
@@ -141,7 +141,7 @@ public function question()
 		{
             if( ! empty($_POST['action']) )
             {
-                question_export(Yii::app()->request->getPost('action'), $surveyid, $gid, $qid);
+                questionExport(Yii::app()->request->getPost('action'), $surveyid, $gid, $qid);
                 return;
             }
 
@@ -151,7 +151,7 @@ public function question()
         }
         else
         {
-            question_export("exportstructurecsvQuestion", $surveyid, $gid, $qid);
+            questionExport("exportstructurecsvQuestion", $surveyid, $gid, $qid);
 
             return;
         }
@@ -429,7 +429,7 @@ public function exportspss()
 			}
 
             $na = "";
-            spss_export_data($na);
+            SPSSExportData($na);
 
             exit;
         }
@@ -442,10 +442,10 @@ public function exportspss()
             header("Pragma: public");
 
             // Build array that has to be returned
-            $fields = spss_fieldmap();
+            $fields = SPSSFieldMap();
 
             //Now get the query string with all fields to export
-            $query = spss_getquery();
+            $query = SPSSGetQuery();
             $result = Yii::app()->db->createCommand($query)->query()->readAll(); //Checked
 
             $num_fields = isset( $result[0] ) ? count($result[0]) : 0;
@@ -461,14 +461,14 @@ public function exportspss()
                     //Performance improvement, don't recheck fields that have valuelabels
                     if ( ! isset($fields[$fieldno]['answers']) )
 					{
-                        $strTmp = mb_substr(strip_tags_full($row[$fieldno]), 0, $length_data);
+                        $strTmp = mb_substr(stripTagsFull($row[$fieldno]), 0, $length_data);
                         $len = mb_strlen($strTmp);
 
                         if ( $len > $fields[$fieldno]['size'] ) $fields[$fieldno]['size'] = $len;
 
                         if ( trim($strTmp) != '' )
 						{
-                            if ( $fields[$fieldno]['SPSStype'] == 'F' && (my_is_numeric($strTmp) === FALSE || $fields[$fieldno]['size'] > 16) )
+                            if ( $fields[$fieldno]['SPSStype'] == 'F' && (isNumericExtended($strTmp) === FALSE || $fields[$fieldno]['size'] > 16) )
                             {
                                 $fields[$fieldno]['SPSStype'] = 'A';
                             }
@@ -528,7 +528,7 @@ public function exportspss()
 			{
                 if ( ! $field['hide'] )
 				{
-					echo "VARIABLE LABELS " . $field['id'] . " \"" . str_replace('"','""',mb_substr(strip_tags_full($field['VariableLabel']), 0, $length_varlabel)) . "\".\n";
+					echo "VARIABLE LABELS " . $field['id'] . " \"" . str_replace('"','""',mb_substr(stripTagsFull($field['VariableLabel']), 0, $length_varlabel)) . "\".\n";
 				}
             }
 
@@ -548,7 +548,7 @@ public function exportspss()
 					{
                         $i++;
 
-                        if ( $field['SPSStype'] == "F" && my_is_numeric($answer['code']) )
+                        if ( $field['SPSStype'] == "F" && isNumericExtended($answer['code']) )
 						{
                             $str = "{$answer['code']}";
                         }
@@ -689,7 +689,7 @@ public function exportr()
             header("Pragma: public");
 
             $na = "";	//change to empty string instead of two double quotes to fix warnings on NA
-            spss_export_data($na);
+            SPSSExportData($na);
 
             exit;
         }
@@ -709,10 +709,10 @@ public function exportr()
 
 
             // Build array that has to be returned
-            $fields = spss_fieldmap("V");
+            $fields = SPSSFieldMap("V");
 
             //Now get the query string with all fields to export
-            $query = spss_getquery();
+            $query = SPSSGetQuery();
 
             $result = Yii::app()->db->createCommand($query)->query(); //Checked
         	$result = $result->readAll();
@@ -729,14 +729,14 @@ public function exportr()
                     //Performance improvement, don't recheck fields that have valuelabels
                     if ( ! isset($fields[$fieldno]['answers']) )
 					{
-                        $strTmp = mb_substr(strip_tags_full($row[$fieldno]), 0, $length_data);
+                        $strTmp = mb_substr(stripTagsFull($row[$fieldno]), 0, $length_data);
                         $len = mb_strlen($strTmp);
 
                         if ( $len > $fields[$fieldno]['size'] ) $fields[$fieldno]['size'] = $len;
 
                         if ( trim($strTmp) != '' )
 						{
-                            if ( $fields[$fieldno]['SPSStype'] == 'F' && (my_is_numeric($strTmp) === FALSE || $fields[$fieldno]['size'] > 16) )
+                            if ( $fields[$fieldno]['SPSStype'] == 'F' && (isNumericExtended($strTmp) === FALSE || $fields[$fieldno]['size'] > 16) )
                             {
                                 $fields[$fieldno]['SPSStype'] = 'A';
                             }
@@ -782,7 +782,7 @@ public function exportr()
 						. addslashes(
 							htmlspecialchars_decode(
 								mb_substr(
-									strip_tags_full(
+									stripTagsFull(
 										$field['VariableLabel']
 									), 0, $length_varlabel
 								)
@@ -801,7 +801,7 @@ public function exportr()
                         $str = "";
                         foreach ( $answers as $answer )
 						{
-                            if ( $field['SPSStype'] == "F" && my_is_numeric($answer['code']) )
+                            if ( $field['SPSStype'] == "F" && isNumericExtended($answer['code']) )
 							{
                                 $str .= ",{$answer['code']}";
                             }
@@ -1170,11 +1170,11 @@ public function dumplabel()
 
         // Label sets table
         $lsquery = "SELECT * FROM {{labelsets}} WHERE lid=" . implode(' or lid=', $lids);
-        BuildXMLFromQuery($xml, $lsquery, 'labelsets');
+        buildXMLFromQuery($xml, $lsquery, 'labelsets');
 
         // Labels
         $lquery = "SELECT lid, code, title, sortorder, language, assessment_value FROM {{labels}} WHERE lid=" . implode(' or lid=', $lids);
-        BuildXMLFromQuery($xml, $lquery, 'labels');
+        buildXMLFromQuery($xml, $lquery, 'labels');
         $xml->endElement(); // close columns
         $xml->endDocument();
         exit;
@@ -1202,7 +1202,7 @@ private function _exportarchive($iSurveyID, $bSendToBrowser=TRUE)
     	Yii::import('application.libraries.admin.pclzip.pclzip', TRUE);
         $zip = new PclZip($aZIPFileName);
 
-        file_put_contents($sLSSFileName, survey_getXMLData($iSurveyID));
+        file_put_contents($sLSSFileName, surveyGetXMLData($iSurveyID));
 
 		$this->_addToZip($zip, $sLSSFileName, 'survey_' . $iSurveyID . '.lss');
 
@@ -1278,7 +1278,7 @@ private function _surveyexport($action, $surveyid)
 
 			$this->_addHeaders($fn, "text/xml", "Mon, 26 Jul 1997 05:00:00 GMT");
 
-            echo survey_getXMLData($surveyid);
+            echo surveyGetXMLData($surveyid);
             exit;
         }
         elseif ( $action == "exportstructurequexml" )
diff --git a/application/controllers/admin/index.html b/application/controllers/admin/index.html
new file mode 100644
index 00000000000..c942a79ce6a
--- /dev/null
+++ b/application/controllers/admin/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/application/controllers/admin/fck_LimeReplacementFields.php b/application/controllers/admin/limereplacementfields.php
similarity index 97%
rename from application/controllers/admin/fck_LimeReplacementFields.php
rename to application/controllers/admin/limereplacementfields.php
index dc79fb164a0..53e7391732e 100644
--- a/application/controllers/admin/fck_LimeReplacementFields.php
+++ b/application/controllers/admin/limereplacementfields.php
@@ -12,7 +12,7 @@
  *
  * $Id$
  */
-class fck_LimeReplacementFields extends Survey_Common_Action
+class limereplacementfields extends Survey_Common_Action
 {
 
     public function index($fieldtype, $action, $surveyid = false, $gid = false, $qid = false)
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
index 075ff30201d..1f9510bc71c 100644
--- a/application/controllers/admin/participantsaction.php
+++ b/application/controllers/admin/participantsaction.php
@@ -575,7 +575,7 @@ function exporttocsvAll()
         }
 
         // Load the helper and pass the array to be written to a CSV file
-        cpdb_export($outputarray, "central_" . time());
+        CPDBExport($outputarray, "central_" . time());
     }
 
     /**
@@ -726,7 +726,7 @@ function exporttocsv()
                 }
                 $i++;
             }
-            cpdb_export($outputarray, "central_" . time());
+            CPDBExport($outputarray, "central_" . time());
         }
         else
         {
@@ -763,7 +763,7 @@ function exporttocsv()
                 }
                 $i++;
             }
-            cpdb_export($outputarray, "central_" . time());
+            CPDBExport($outputarray, "central_" . time());
         }
     }
 
diff --git a/application/controllers/admin/surveyaction.php b/application/controllers/admin/surveyaction.php
index d8db1280e7e..cf1304c89b3 100644
--- a/application/controllers/admin/surveyaction.php
+++ b/application/controllers/admin/surveyaction.php
@@ -838,7 +838,7 @@ public function copy()
                 }
 
                 Yii::app()->loadHelper('export');
-                $copysurveydata = survey_getXMLData($surveyid, $exclude);
+                $copysurveydata = surveyGetXMLData($surveyid, $exclude);
             }
 
             // Now, we have the survey : start importing
@@ -1349,7 +1349,7 @@ function getUrlParamsJSON($iSurveyId)
     {
         $iSurveyId = (int) $iSurveyId;
         Yii::app()->loadHelper('database');
-        $oResult = db_execute_assoc("select '' as act, up.*,q.title, sq.title as sqtitle, q.question, sq.question as sqquestion from {{survey_url_parameters}} up
+        $oResult = dbExecuteAssoc("select '' as act, up.*,q.title, sq.title as sqtitle, q.question, sq.question as sqquestion from {{survey_url_parameters}} up
                             left join {{questions}} q on q.qid=up.targetqid
                             left join {{questions}} sq on q.qid=up.targetqid
                             where up.sid={$iSurveyId}");
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
index 8d35ccece62..d7206c995b4 100644
--- a/application/controllers/admin/tokens.php
+++ b/application/controllers/admin/tokens.php
@@ -1174,7 +1174,7 @@ function exportdialog($iSurveyId)
         if (Yii::app()->request->getPost('submit'))
         {
             Yii::app()->loadHelper("export");
-            tokens_export($iSurveyId);
+            tokensExport($iSurveyId);
         }
 
         $aData['resultr'] = Tokens_dynamic::model($iSurveyId)->find(array('select' => 'language', 'group' => 'language'));
@@ -1957,7 +1957,7 @@ function _newtokentable($iSurveyId)
         else
         {
             $this->getController()->loadHelper('database');
-            $result = Yii::app()->db->createCommand(db_select_tables_like('{{old_tokens_".intval($iSurveyId)."_%}}'))->queryAll();
+            $result = Yii::app()->db->createCommand(dbSelectTablesLike('{{old_tokens_".intval($iSurveyId)."_%}}'))->queryAll();
             $tcount = count($result);
             if ($tcount > 0)
             {
diff --git a/application/controllers/admin/usergroups.php b/application/controllers/admin/usergroups.php
index e72fe0f9b97..a00b1077c01 100644
--- a/application/controllers/admin/usergroups.php
+++ b/application/controllers/admin/usergroups.php
@@ -297,9 +297,9 @@ public function index($ugid = false, $header = false)
                 }
                 //$this->user_in_groups_model = new User_in_groups;
                 $eguquery = "SELECT * FROM {{user_in_groups}} AS a INNER JOIN {{users}} AS b ON a.uid = b.uid WHERE ugid = " . $ugid . " ORDER BY b.users_name";
-                $eguresult = db_execute_assoc($eguquery);
+                $eguresult = dbExecuteAssoc($eguquery);
                 $query2 = "SELECT ugid FROM {{user_groups}} WHERE ugid = " . $ugid . " AND owner_id = " . Yii::app()->session['loginID'];
-                $result2 = db_select_limit_assoc($query2, 1);
+                $result2 = dbSelectLimitAssoc($query2, 1);
                 $row2 = $result2->readAll();
                 $row = 1;
                 $userloop = array();
diff --git a/application/controllers/tcpdf_check.php b/application/controllers/tcpdf_check.php
deleted file mode 100644
index 408a9fce859..00000000000
--- a/application/controllers/tcpdf_check.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php if ( ! defined('BASEPATH')) die('No direct script access allowed');
-
-class Tcpdf_check extends CAction {
-
-    public function run()
-	{
-        $this->index();
-    }
-    
-    function index()
-    {
-        require_once(APPPATH.'/third_party/tcpdf/tcpdf.php');
-        Yii::app()->getConfig("tcpdf");
-        $pdf = new TCPDF();
-        $pdf->SetHeaderData(
-			Yii::app()->getConfig('header_logo'),
-			Yii::app()->getConfig('header_logo_width'),
-			Yii::app()->getConfig('header_title'),
-			Yii::app()->getConfig('header_string')
-		);
-
-        // set document information
-        $pdf->SetSubject('TCPDF Tutorial');
-        $pdf->SetKeywords('TCPDF, PDF, example, test, guide');
-
-        // set font
-        $pdf->SetFont('times', 'BI', 16);
-
-        // add a page
-        $pdf->AddPage();
-
-        // print a line using Cell()
-        $pdf->Cell(0, 12, 'Example 001 - Watsup dude', 1, 1, 'C');
-
-        //Close and output PDF document
-        $pdf->Output('example_001.pdf', 'I');
-    }
-}
\ No newline at end of file
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
index c384431f629..783c3767c14 100644
--- a/application/core/Survey_Common_Action.php
+++ b/application/core/Survey_Common_Action.php
@@ -899,8 +899,8 @@ function _userGroupBar($ugid = 0)
 
         if (!empty($ugid)) {
             $grpquery = "SELECT gp.* FROM {{user_groups}} AS gp, {{user_in_groups}} AS gu WHERE gp.ugid=gu.ugid AND gp.ugid = $ugid AND gu.uid=" . Yii::app()->session['loginID'];
-            $grpresult = db_execute_assoc($grpquery);
-            $grpresultcount = db_records_count($grpquery);
+            $grpresult = dbExecuteAssoc($grpquery);
+            $grpresultcount = dbRecordsCount($grpquery);
 
             if ($grpresultcount > 0) {
                 $grow = array_map('htmlspecialchars', $grpresult->read());
diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php
index 895fe510551..522533a7690 100644
--- a/application/helpers/admin/activate_helper.php
+++ b/application/helpers/admin/activate_helper.php
@@ -26,7 +26,7 @@ function fixNumbering($fixnumbering, $surveyid)
      //Fix a question id - requires renumbering a question
     $oldqid = $fixnumbering;
     $query = "SELECT qid FROM {{questions}} ORDER BY qid DESC";
-    $result = db_select_limit_assoc($query, 1);
+    $result = dbSelectLimitAssoc($query, 1);
     foreach ($result->readAll() as $row) {$lastqid=$row['qid'];}
     $newqid=$lastqid+1;
     $query = "UPDATE {{questions}} SET qid=$newqid WHERE qid=$oldqid";
@@ -39,7 +39,7 @@ function fixNumbering($fixnumbering, $surveyid)
     $result = db_execute_assosc($query);
     //Now conditions based upon this question
     $query = "SELECT cqid, cfieldname FROM {{conditions}} WHERE cqid=$oldqid";
-    $result = db_execute_assoc($query);
+    $result = dbExecuteAssoc($query);
     foreach ($result->readAll() as $row)
     {
         $switcher[]=array("cqid"=>$row['cqid'], "cfieldname"=>$row['cfieldname']);
@@ -534,7 +534,7 @@ function mssql_drop_constraint($fieldname, $tablename)
                       sys.sysconstraints AS con ON c_obj.id = con.constid INNER JOIN
                       sys.syscolumns AS col ON t_obj.id = col.id AND con.colid = col.colid
                 WHERE (c_obj.xtype = 'D') AND (col.name = '$fieldname') AND (t_obj.name={{{$tablename}}})";
-    $result = db_execute_assoc($dfquery)->read();
+    $result = dbExecuteAssoc($dfquery)->read();
     $defaultname=$result['CONTRAINT_NAME'];
     if ($defaultname!=false)
     {
@@ -553,7 +553,7 @@ function mssql_drop_primary_index($tablename)
               ."FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS "
               ."WHERE     (TABLE_NAME = {{{$tablename}}}) AND (CONSTRAINT_TYPE = 'PRIMARY KEY')";
 
-    $result = db_execute_assoc($pkquery)->read();
+    $result = dbExecuteAssoc($pkquery)->read();
     $primarykey=$result['CONTSTRAINT_NAME'];
     if ($primarykey!=false)
     {
diff --git a/application/helpers/admin/exportresults_helper.php b/application/helpers/admin/exportresults_helper.php
index 2db6f54b482..fcdccffa0c9 100644
--- a/application/helpers/admin/exportresults_helper.php
+++ b/application/helpers/admin/exportresults_helper.php
@@ -916,7 +916,7 @@ public function getAbbreviatedHeading(SurveyObj $survey, $fieldName)
         if ($question)
         {
             $heading = $question['question'];
-            $heading = $this->strip_tags_full($heading);
+            $heading = $this->stripTagsFull($heading);
             $heading = mb_substr($heading, 0, 15).'.. ';
             $aid = $survey->fieldMap[$fieldName]['aid'];
             if (!empty($aid))
@@ -941,7 +941,7 @@ public function getFullHeading(SurveyObj $survey, FormattingOptions $options, $f
     {
         $question = $survey->getQuestionArray($fieldName);
         $heading = $question['question'];
-        $heading = $this->strip_tags_full($heading);
+        $heading = $this->stripTagsFull($heading);
         $heading.=$this->getFullFieldSubHeading($survey, $options, $fieldName);
         return $heading;
     }
@@ -950,7 +950,7 @@ public function getCodeHeading(SurveyObj $survey, FormattingOptions $options, $f
     {
         $question = $survey->getQuestionArray($fieldName);
         $heading = $question['title'];
-        $heading = $this->strip_tags_full($heading);
+        $heading = $this->stripTagsFull($heading);
         $heading.=$this->getCodeFieldSubHeading($survey, $options, $fieldName);
         return $heading;
     }
@@ -1133,7 +1133,7 @@ public function getFullFieldSubHeading(SurveyObj $survey, FormattingOptions $opt
                     }
                 }
 
-                $subHeading .= ' ['.$this->strip_tags_full($scaleZeroText).']['.$this->strip_tags_full($scaleOneText).']';
+                $subHeading .= ' ['.$this->stripTagsFull($scaleZeroText).']['.$this->stripTagsFull($scaleOneText).']';
                 break;
 
             case '1':
@@ -1160,7 +1160,7 @@ public function getFullFieldSubHeading(SurveyObj $survey, FormattingOptions $opt
                 }
                 if (!empty($subQuestion) && !empty($subQuestion['question']))
                 {
-                    $subHeading .= ' ['.$this->strip_tags_full($subQuestion['question']).']';
+                    $subHeading .= ' ['.$this->stripTagsFull($subQuestion['question']).']';
                 }
         }
 
@@ -1184,7 +1184,7 @@ private function getCommentSubHeading()
     * type of field the value is a response for, and the FormattingOptions.
     * All transforms should be processed during the execution of this function!
     *
-    * The final step in the transform is to apply a strip_tags_full on the $value.
+    * The final step in the transform is to apply a stripTagsFull on the $value.
     * This occurs for ALL values whether or not any other transform is applied.
     *
     * @param string $value
@@ -1212,7 +1212,7 @@ private function transformResponseValue($value, $fieldType, FormattingOptions $o
         }
 
         //This spot should only be reached if no transformation occurs.
-        return $this->strip_tags_full($value);
+        return $this->stripTagsFull($value);
     }
 
     /**
@@ -1315,7 +1315,7 @@ final public function write(SurveyObj $survey, $languageCode, FormattingOptions
         }
     }
 
-    protected function strip_tags_full($string)
+    protected function stripTagsFull($string)
     {
         $string=str_replace('-oth-','',$string);
         return flattenText($string,false,true,'UTF-8',false);
@@ -1632,7 +1632,7 @@ public function outputRecord($headers, $values, FormattingOptions $options)
             foreach($headers as $header)
             {
                 $this->pdf->intopdf($header);
-                $this->pdf->intopdf($this->strip_tags_full($values[$columnCounter]));
+                $this->pdf->intopdf($this->stripTagsFull($values[$columnCounter]));
                 $columnCounter++;
             }
         }
diff --git a/application/helpers/admin/htmleditor_helper.php b/application/helpers/admin/htmleditor_helper.php
index c6740517724..5084c1f35a0 100644
--- a/application/helpers/admin/htmleditor_helper.php
+++ b/application/helpers/admin/htmleditor_helper.php
@@ -177,7 +177,7 @@ function getInlineEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=n
                                                                 ,LimeReplacementFieldsQID : \"".$qID."\"
                                                                 ,LimeReplacementFieldsType : \"".$fieldtype."\"
                                                                 ,LimeReplacementFieldsAction : \"".$action."\"
-                                                                ,LimeReplacementFieldsPath : \"".Yii::app()->getController()->createUrl("admin/fck_LimeReplacementFields/index/")."\"
+                                                                ,LimeReplacementFieldsPath : \"".Yii::app()->getController()->createUrl("admin/limereplacementfields/index/")."\"
                                                                 ,width:'660'
                                                                 ,language:'".sTranslateLangCode2CK(Yii::app()->getConfig('adminlang'))."'
                                                                 ,smiley_path : \"".Yii::app()->getConfig('uploadurl')."/images/smiley/msn/\"\n"
diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
index 96658d29969..fb32ad6a3b0 100644
--- a/application/helpers/admin/statistics_helper.php
+++ b/application/helpers/admin/statistics_helper.php
@@ -1890,7 +1890,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
                         {
                         	$qrow=array_values($qrow);
                             $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND code = '{$licode}' AND language='{$language}'ORDER BY sortorder, code";
-                            $fresult = db_execute_assoc($fquery);
+                            $fresult = dbExecuteAssoc($fquery);
                             foreach ($result->readAll() as $frow)
                             {
                                 $alist[]=array($frow['code'], $frow['answer']);
@@ -1957,7 +1957,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
 
                             //this question type uses its own labels
                             $fquery = "SELECT * FROM {{answers}} WHERE qid='{$qiqid}' AND scale_id=0 AND language='{$language}'ORDER BY sortorder, code";
-                            $fresult = db_execute_assoc($fquery);
+                            $fresult = dbExecuteAssoc($fquery);
 
                             //add code and title to results for outputting them later
                             foreach ($fresult->readAll() as $frow)
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index c73b4e536b8..a44df007b34 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -752,7 +752,7 @@ function convertGETtoPOST($url)
 function calculateTotalFileUploadUsage(){
     global $uploaddir;
     $sQuery='select sid from {{surveys}}';
-    $oResult = db_execute_assoc($sQuery); //checked
+    $oResult = dbExecuteAssoc($sQuery); //checked
     $aRows = $oResult->readAll();
     $iTotalSize=0.0;
     foreach ($aRows as $aRow)
@@ -2791,7 +2791,7 @@ function setUserRights($uid, $rights)
     . ", manage_template=".$rights['manage_template']
     . ", manage_label=".$rights['manage_label'];
     $uquery = "UPDATE {{users}} SET ".$updates." WHERE uid = ".$uid;
-    return db_select_limit_assoc($uquery);     //Checked
+    return dbSelectLimitAssoc($uquery);     //Checked
 }
 
 /**
@@ -4514,7 +4514,7 @@ function getArrayFilterExcludesForQuestion($qid)
                     // we found the target question, now we need to know what the answers were!
                     $fields[0]=sanitize_int($fields[0]);
                     $query = "SELECT title FROM {{questions}} where parent_qid='{$fields[0]}' AND language='".Yii::app()->session[$surveyid]['s_lang']."' order by question_order";
-                    $qresult = db_execute_assoc($query);  //Checked
+                    $qresult = dbExecuteAssoc($query);  //Checked
                     foreach ($qresult->readAll() as $code)
                     {
                         if (isset(Yii::app()->session[$fields[1]]))
@@ -4524,7 +4524,7 @@ function getArrayFilterExcludesForQuestion($qid)
                     }
                     //Now we also need to find out if (a) the question had "other" enabled, and (b) if that was selected
                     $query = "SELECT other FROM {{questions}} where qid='{$fields[0]}'";
-                    $qresult = db_execute_assoc($query);
+                    $qresult = dbExecuteAssoc($query);
                     foreach ($qresult->readAll() as $row) {$other=$row['other'];}
                     if($other == "Y")
                     {
@@ -5827,7 +5827,7 @@ function translateInsertansTags($newsid,$oldsid,$fieldnames)
     # translate 'surveyls_urldescription' and 'surveyls_url' INSERTANS tags in surveyls
     $sql = "SELECT surveyls_survey_id, surveyls_language, surveyls_urldescription, surveyls_url from {{surveys_languagesettings}}
     WHERE surveyls_survey_id=".$newsid." AND (surveyls_urldescription LIKE '%{$oldsid}X%' OR surveyls_url LIKE '%{$oldsid}X%')";
-    $result = db_execute_assoc($sql) or show_error("Can't read groups table in transInsertAns ");     // Checked
+    $result = dbExecuteAssoc($sql) or show_error("Can't read groups table in transInsertAns ");     // Checked
 
     //while ($qentry = $res->FetchRow())
     foreach ($result->readAll() as $qentry)
@@ -5868,7 +5868,7 @@ function translateInsertansTags($newsid,$oldsid,$fieldnames)
     # translate 'quotals_urldescrip' and 'quotals_url' INSERTANS tags in quota_languagesettings
     $sql = "SELECT quotals_id, quotals_urldescrip, quotals_url from {{quota_languagesettings}} qls, {{quota}} q
     WHERE sid=".$newsid." AND q.id=qls.quotals_quota_id AND (quotals_urldescrip LIKE '%{$oldsid}X%' OR quotals_url LIKE '%{$oldsid}X%')";
-    $res = db_execute_assoc($sql) or safeDie("Can't read quota table in transInsertAns");     // Checked
+    $res = dbExecuteAssoc($sql) or safeDie("Can't read quota table in transInsertAns");     // Checked
 
     foreach ($result->readAll() as $qentry)
     {
@@ -5887,14 +5887,14 @@ function translateInsertansTags($newsid,$oldsid,$fieldnames)
         {
             // Update Field
             $sqlupdate = "UPDATE {{quota_languagesettings}} SET quotals_urldescrip='".db_quote($urldescription)."', quotals_url='".db_quote($endurl)."' WHERE quotals_id={$qentry['quotals_id']}";
-            $updateres=db_execute_assoc($sqlupdate) or safeDie ("Couldn't update INSERTANS in quota_languagesettings<br />$sqlupdate<br />");    //Checked
+            $updateres=dbExecuteAssoc($sqlupdate) or safeDie ("Couldn't update INSERTANS in quota_languagesettings<br />$sqlupdate<br />");    //Checked
         } // Enf if modified
     } // end while qentry
 
     # translate 'description' INSERTANS tags in groups
     $sql = "SELECT gid, language, group_name, description from {{groups}}
     WHERE sid=".$newsid." AND description LIKE '%{$oldsid}X%' OR group_name LIKE '%{$oldsid}X%'";
-    $res = db_execute_assoc($sql) or show_error("Can't read groups table in transInsertAns");     // Checked
+    $res = dbExecuteAssoc($sql) or show_error("Can't read groups table in transInsertAns");     // Checked
 
     //while ($qentry = $res->FetchRow())
     foreach ($res->readAll() as $qentry)
@@ -5935,7 +5935,7 @@ function translateInsertansTags($newsid,$oldsid,$fieldnames)
     # translate 'question' and 'help' INSERTANS tags in questions
     $sql = "SELECT qid, language, question, help from {{questions}}
     WHERE sid=".$newsid." AND (question LIKE '%{$oldsid}X%' OR help LIKE '%{$oldsid}X%')";
-    $result = db_execute_assoc($sql) or die("Can't read question table in transInsertAns ");     // Checked
+    $result = dbExecuteAssoc($sql) or die("Can't read question table in transInsertAns ");     // Checked
 
     //while ($qentry = $res->FetchRow())
     $aResultData=$result->readAll() ;
@@ -6189,23 +6189,23 @@ function cleanLanguagesFromSurvey($sid, $availlangs)
 
     // Remove From Answers Table
     $query = "SELECT qid FROM {{questions}} WHERE sid='{$sid}' AND $sqllang";
-    $qidresult = db_execute_assoc($query);
+    $qidresult = dbExecuteAssoc($query);
 
     foreach ($qidresult->readAll() as $qrow)
     {
 
         $myqid = $qrow['qid'];
         $query = "DELETE FROM {{answers}} WHERE qid='$myqid' AND $sqllang";
-        db_execute_assoc($query);
+        dbExecuteAssoc($query);
     }
 
     // Remove From Questions Table
     $query = "DELETE FROM {{questions}} WHERE sid='{$sid}' AND $sqllang";
-    db_execute_assoc($query);
+    dbExecuteAssoc($query);
 
     // Remove From Groups Table
     $query = "DELETE FROM {{groups}} WHERE sid='{$sid}' AND $sqllang";
-    db_execute_assoc($query);
+    dbExecuteAssoc($query);
 
     return true;
 }
@@ -6794,7 +6794,7 @@ function getGroupUserList($ugid)
     $ugid=sanitize_int($ugid);
     $surveyidquery = "SELECT a.uid, a.users_name FROM {{users}} AS a LEFT JOIN (SELECT uid AS id FROM {{user_in_groups}} WHERE ugid = {$ugid}) AS b ON a.uid = b.id WHERE id IS NULL ORDER BY a.users_name";
 
-    $surveyidresult = db_execute_assoc($surveyidquery);  //Checked
+    $surveyidresult = dbExecuteAssoc($surveyidquery);  //Checked
     if (!$surveyidresult) {return "Database Error";}
     $surveyselecter = "";
     foreach ($surveyidresult->readAll() as $row)
diff --git a/application/helpers/database_helper.php b/application/helpers/database_helper.php
index 69609cc4a7c..e03292e481c 100644
--- a/application/helpers/database_helper.php
+++ b/application/helpers/database_helper.php
@@ -1,75 +1,54 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /*
- * LimeSurvey
- * Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
- * All rights reserved.
- * License: GNU/GPL License v2 or later, see LICENSE.php
- * LimeSurvey is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * See COPYRIGHT.php for copyright notices and details.
- *
- *	$Id$
- */
-function db_execute_assoc($sql,$inputarr=false,$silent=false)
+* LimeSurvey
+* Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
+* All rights reserved.
+* License: GNU/GPL License v2 or later, see LICENSE.php
+* LimeSurvey is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*
+*	$Id$
+*/
+function dbExecuteAssoc($sql,$inputarr=false,$silent=false)
 {
 
-	try {
-		if($inputarr)
-		{
-				$dataset=Yii::app()->db->createCommand($sql)->bindValues($inputarr)->query();	//Checked
-		}
-		else
-		{
-				$dataset=Yii::app()->db->createCommand($sql)->query();
-
-		}
-	} catch(CDbException $e) {
-		$dataset=false;
-	}
-
-    if (!$silent && !$dataset)  { safeDie('Error executing query in db_execute_assoc:'.$sql); }
+    try {
+        if($inputarr)
+        {
+            $dataset=Yii::app()->db->createCommand($sql)->bindValues($inputarr)->query();	//Checked
+        }
+        else
+        {
+            $dataset=Yii::app()->db->createCommand($sql)->query();
+
+        }
+    } catch(CDbException $e) {
+        $dataset=false;
+    }
+
+    if (!$silent && !$dataset)  { safeDie('Error executing query in dbExecuteAssoc:'.$sql); }
     return $dataset;
 }
 
 
-function &db_query_or_false($sql)
+function &dbQueryOrFalse($sql)
 {
-	try {
+    try {
         $dataset=Yii::app()->db->createCommand($sql)->query();
-	} catch(CDbException $e) {
-		$dataset=false;
-	}
-	return $dataset;
+    } catch(CDbException $e) {
+        $dataset=false;
+    }
+    return $dataset;
 }
 
-/**
-  * Returns the number of records found in the database
-  *
-  * @param string $sql
-  * @return int
-*/
-function &db_records_count($sql)
-{
-	$yii = Yii::app();
-	$count = 0;
-	try
-	{
-		$result = $yii->db->createCommand($sql)->query();
-		$count = $result->count();
-	}
-	catch(CDbException $e)
-	{
-		$count = FALSE;
-	}
-
-	return $count;
-}
 
-function &db_select_limit_assoc($sql,$numrows=0,$offset=0,$inputarr=false,$dieonerror=true)
+function &dbSelectLimitAssoc($sql,$numrows=0,$offset=0,$inputarr=false,$dieonerror=true)
 {
-	$query = Yii::app()->db->createCommand($sql.= " ");
+    $query = Yii::app()->db->createCommand($sql.= " ");
     if ($numrows)
     {
         if ($offset)
@@ -85,31 +64,31 @@ function &db_select_limit_assoc($sql,$numrows=0,$offset=0,$inputarr=false,$dieon
     {
         $query->bindValues($inputarr);    //Checked
     }
-	try
+    try
+    {
+        $dataset=$query->query();
+    }
+    catch (CDbException $e)
     {
-		$dataset=$query->query();
+        $dataset=false;
     }
-	catch (CDbException $e)
-	{
-		$dataset=false;
-	}
-	if (!$dataset && $dieonerror) {safeDie('Error executing query in db_select_limit_assoc:'.$query->text);}
+    if (!$dataset && $dieonerror) {safeDie('Error executing query in dbSelectLimitAssoc:'.$query->text);}
     return $dataset;
 }
 
 
 /**
- * Returns the first row of values of the $sql query result
- * as a 1-dimensional array
- *
- * @param mixed $sql
- */
-function &db_select_column($sql)
+* Returns the first row of values of the $sql query result
+* as a 1-dimensional array
+*
+* @param mixed $sql
+*/
+function &dbSelectColumn($sql)
 {
     $dataset=Yii::app()->db->createCommand($sql)->query();
     if ($dataset->count() > 0)
     {
-            $fields = array_keys($dataset[0]);
+        $fields = array_keys($dataset[0]);
         $firstfield = $fields[0];
         $resultarray=array();
         foreach ($dataset->readAll() as $row)
@@ -117,22 +96,22 @@ function &db_select_column($sql)
             $resultarray[] = $row[$firstfield];
         }
         /**while ($row = $dataset->fetchRow()) {
-            $resultarray[]=$row[0];
+        $resultarray[]=$row[0];
         }*/
     }
     else
-    safeDie('No results were returned from the query :'.$sql);
+        safeDie('No results were returned from the query :'.$sql);
     return $resultarray;
 }
 
 
 /**
- * This functions quotes fieldnames accordingly
- *
- * @param mixed $id Fieldname to be quoted
- */
+* This functions quotes fieldnames accordingly
+*
+* @param mixed $id Fieldname to be quoted
+*/
 
-function db_quote_id($id)
+function dbQuoteID($id)
 {
     switch (Yii::app()->db->getDriverName())
     {
@@ -142,7 +121,7 @@ function db_quote_id($id)
             break;
         case "mssql_n" :
         case "mssql" :
-		case "mssqlnative" :
+        case "mssqlnative" :
         case "odbc_mssql" :
             return "[".$id."]";
             break;
@@ -154,7 +133,7 @@ function db_quote_id($id)
     }
 }
 
-function db_random()
+function dbRandom()
 {
     if (Yii::app()->db->getDriverName() == 'odbc_mssql' || Yii::app()->db->getDriverName() == 'mssql_n' || Yii::app()->db->getDriverName() == 'odbtp')  {$srandom='NEWID()';}
     else {$srandom= 0 + lcg_value()*(abs(1));}
@@ -163,13 +142,13 @@ function db_random()
 }
 
 /**
- *  Return a sql statement for finding LIKE named tables
- *  Be aware that you have to escape underscor chars by using a backslash
- * otherwise you might get table names returned you don't want
- *
- * @param mixed $table
- */
-function db_select_tables_like($table)
+*  Return a sql statement for finding LIKE named tables
+*  Be aware that you have to escape underscor chars by using a backslash
+* otherwise you might get table names returned you don't want
+*
+* @param mixed $table
+*/
+function dbSelectTablesLike($table)
 {
     switch (Yii::app()->db->getDriverName()) {
         case 'mysqli':
@@ -186,23 +165,12 @@ function db_select_tables_like($table)
 }
 
 /**
- * Gets the table names. Do not prefix.
- * @param string $table String to match
- * @uses db_select_tables_like() To get the tables like sql query
- * @return array Array of matched table names
- */
-function db_get_tables_like($table)
-{
-    return (array) Yii::app()->db->createCommand(db_select_tables_like("{{{$table}}}"))->queryAll();
-}
-
-/**
- *  Return a boolean stating if the table(s) exist(s)
- *  Accepts '%' in names since it uses the 'like' statement
- *
- * @param mixed $table
- */
-function db_tables_exist($table)
+* Gets the table names. Do not prefix.
+* @param string $table String to match
+* @uses dbSelectTablesLike() To get the tables like sql query
+* @return array Array of matched table names
+*/
+function dbGetTablesLike($table)
 {
-    return !!Yii::app()->db->schema->getTable($table);
+    return (array) Yii::app()->db->createCommand(dbSelectTablesLike("{{{$table}}}"))->queryAll();
 }
diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php
index 51e8e8f5065..d4a975c139f 100644
--- a/application/helpers/export_helper.php
+++ b/application/helpers/export_helper.php
@@ -19,7 +19,7 @@
 * @param $string
 * @return $string
 */
-function strip_tags_full($string) {
+function stripTagsFull($string) {
     $string=html_entity_decode($string, ENT_QUOTES, "UTF-8");
     //combining these into one mb_ereg_replace call ought to speed things up
     //$string = str_replace(array("\r\n","\r","\n",'-oth-'), '', $string);
@@ -34,7 +34,7 @@ function strip_tags_full($string) {
 * @param $value
 * @return bool
 */
-function my_is_numeric($value)  {
+function isNumericExtended($value)  {
     if (empty($value)) return true;
     $eng_or_world = preg_match
     ('/^[+-]?'. // start marker and sign prefix
@@ -46,14 +46,14 @@ function my_is_numeric($value)  {
     return ($eng_or_world);
 }
 
-function spss_export_data ($na = null) {
+function SPSSExportData ($na = null) {
     global $length_data;
 
     // Build array that has to be returned
-    $fields = spss_fieldmap();
+    $fields = SPSSFieldMap();
 
     //Now get the query string with all fields to export
-    $query = spss_getquery();
+    $query = SPSSGetQuery();
 
     $result=Yii::app()->db->createCommand($query)->query()->readAll(); //Checked
     $num_fields = isset($result[0]) ? count($result[0]) : 0;
@@ -139,12 +139,12 @@ function spss_export_data ($na = null) {
                                     echo("'0'");
                                 }
                             } elseif (!$field['hide']) {
-                                $strTmp=mb_substr(strip_tags_full($row[$fieldno]), 0, $length_data);
+                                $strTmp=mb_substr(stripTagsFull($row[$fieldno]), 0, $length_data);
                                 if (trim($strTmp) != ''){
                                     $strTemp=str_replace(array("'","\n","\r"),array("''",' ',' '),trim($strTmp));
                                     /*
                                     * Temp quick fix for replacing decimal dots with comma's
-                                    if (my_is_numeric($strTemp)) {
+                                    if (isNumericExtended($strTemp)) {
                                     $strTemp = str_replace('.',',',$strTemp);
                                     }
                                     */
@@ -165,10 +165,10 @@ function spss_export_data ($na = null) {
 /**
 * Check it the gives field has a labelset and return it as an array if true
 *
-* @param $field array field from spss_fieldmap
+* @param $field array field from SPSSFieldMap
 * @return array or false
 */
-function spss_getvalues ($field = array(), $qidattributes = null ) {
+function SPSSGetValues ($field = array(), $qidattributes = null ) {
     global $surveyid, $language, $length_vallabel;
     $clang = Yii::app()->lang;
 
@@ -194,7 +194,7 @@ function spss_getvalues ($field = array(), $qidattributes = null ) {
                 for ($i=0; $i < $num_results; $i++)
                 {
                     $row = $result->read();
-                    $answers[] = array('code'=>$row['code'], 'value'=>mb_substr(strip_tags_full($row["answer"]),0,$length_vallabel));
+                    $answers[] = array('code'=>$row['code'], 'value'=>mb_substr(stripTagsFull($row["answer"]),0,$length_vallabel));
                 }
             }
         }
@@ -262,7 +262,7 @@ function spss_getvalues ($field = array(), $qidattributes = null ) {
         foreach ($answers as $answer) {
             $len = mb_strlen($answer['code']);
             if ($len>$size) $size = $len;
-            if ($spsstype=='F' && (my_is_numeric($answer['code'])===false || $size>16)) $spsstype='A';
+            if ($spsstype=='F' && (isNumericExtended($answer['code'])===false || $size>16)) $spsstype='A';
         }
         $answers['SPSStype'] = $spsstype;
         $answers['size'] = $size;
@@ -278,7 +278,7 @@ function spss_getvalues ($field = array(), $qidattributes = null ) {
 * @param $prefix string prefix for the variable ID
 * @return array
 */
-function spss_fieldmap($prefix = 'V') {
+function SPSSFieldMap($prefix = 'V') {
     global $surveyid, $typeMap, $clang, $surveyprivate, $tokensexist, $language;
 
     $fieldmap = createFieldMap($surveyid,'full',false,false,getBaseLanguageFromSurveyID($surveyid));
@@ -412,7 +412,7 @@ function spss_fieldmap($prefix = 'V') {
         'ValueLabels'=>'','VariableLabel'=>$varlabel,"sql_name"=>$fieldname,"size"=>$val_size,
         'title'=>$ftitle,'hide'=>$hide,'scale'=>$export_scale, 'scale_id'=>$scale_id);
         //Now check if we have to retrieve value labels
-        $answers = spss_getvalues($tempArray, $aQuestionAttribs);
+        $answers = SPSSGetValues($tempArray, $aQuestionAttribs);
         if (is_array($answers)) {
             //Ok we have answers
             if (isset($answers['size'])) {
@@ -435,7 +435,7 @@ function spss_fieldmap($prefix = 'V') {
 *
 * @return string
 */
-function spss_getquery() {
+function SPSSGetQuery() {
     global $surveyprivate, $surveyid, $tokensexist;
 
     #See if tokens are being used
@@ -469,14 +469,14 @@ function spss_getquery() {
 }
 
 /**
-* BuildXMLFromQuery() creates a datadump of a table in XML using XMLWriter
+* buildXMLFromQuery() creates a datadump of a table in XML using XMLWriter
 *
 * @param mixed $xmlwriter  The existing XMLWriter object
 * @param mixed $Query  The table query to build from
 * @param mixed $tagname  If the XML tag of the resulting question should be named differently than the table name set it here
 * @param array $excludes array of columnames not to include in export
 */
-function BuildXMLFromQuery($xmlwriter, $Query, $tagname='', $excludes = array())
+function buildXMLFromQuery($xmlwriter, $Query, $tagname='', $excludes = array())
 {
     $iChunkSize=3000; // This works even for very large result sets and leaves a minimal memory footprint
 
@@ -545,7 +545,7 @@ function BuildXMLFromQuery($xmlwriter, $Query, $tagname='', $excludes = array())
 /**
 * from export_structure_xml.php
 */
-function survey_getXMLStructure($surveyid, $xmlwriter, $exclude=array())
+function surveyGetXMLStructure($surveyid, $xmlwriter, $exclude=array())
 {
     $sdump = "";
     if ((!isset($exclude) && $exclude['answers'] !== true) || empty($exclude))
@@ -556,14 +556,14 @@ function survey_getXMLStructure($surveyid, $xmlwriter, $exclude=array())
         WHERE {{answers}}.language={{questions}}.language
         AND {{answers}}.qid={{questions}}.qid
         AND {{questions}}.sid=$surveyid";
-        BuildXMLFromQuery($xmlwriter,$aquery);
+        buildXMLFromQuery($xmlwriter,$aquery);
     }
 
     // Assessments
     $query = "SELECT {{assessments}}.*
     FROM {{assessments}}
     WHERE {{assessments}}.sid=$surveyid";
-    BuildXMLFromQuery($xmlwriter,$query);
+    buildXMLFromQuery($xmlwriter,$query);
 
     if ((!isset($exclude) && $exclude['conditions'] !== true) || empty($exclude))
     {
@@ -572,35 +572,35 @@ function survey_getXMLStructure($surveyid, $xmlwriter, $exclude=array())
         FROM {{conditions}}, {{questions}}
         WHERE {{conditions}}.qid={{questions}}.qid
         AND {{questions}}.sid=$surveyid";
-        BuildXMLFromQuery($xmlwriter,$cquery);
+        buildXMLFromQuery($xmlwriter,$cquery);
     }
 
     //Default values
     $query = "SELECT {{defaultvalues}}.*
     FROM {{defaultvalues}} JOIN {{questions}} ON {{questions}}.qid = {{defaultvalues}}.qid AND {{questions}}.sid=$surveyid AND {{questions}}.language={{defaultvalues}}.language ";
 
-    BuildXMLFromQuery($xmlwriter,$query);
+    buildXMLFromQuery($xmlwriter,$query);
 
     // Groups
     $gquery = "SELECT *
     FROM {{groups}}
     WHERE sid=$surveyid
     ORDER BY gid";
-    BuildXMLFromQuery($xmlwriter,$gquery);
+    buildXMLFromQuery($xmlwriter,$gquery);
 
     //Questions
     $qquery = "SELECT *
     FROM {{questions}}
     WHERE sid=$surveyid and parent_qid=0
     ORDER BY qid";
-    BuildXMLFromQuery($xmlwriter,$qquery);
+    buildXMLFromQuery($xmlwriter,$qquery);
 
     //Subquestions
     $qquery = "SELECT *
     FROM {{questions}}
     WHERE sid=$surveyid and parent_qid>0
     ORDER BY qid";
-    BuildXMLFromQuery($xmlwriter,$qquery,'subquestions');
+    buildXMLFromQuery($xmlwriter,$qquery,'subquestions');
 
     //Question attributes
     $sBaseLanguage=Survey::model()->findByPk($surveyid)->language;
@@ -617,7 +617,7 @@ function survey_getXMLStructure($surveyid, $xmlwriter, $exclude=array())
         where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value";
     }
 
-    BuildXMLFromQuery($xmlwriter,$query,'question_attributes');
+    buildXMLFromQuery($xmlwriter,$query,'question_attributes');
 
     if ((!isset($exclude) && $exclude['quotas'] !== true) || empty($exclude))
     {
@@ -625,20 +625,20 @@ function survey_getXMLStructure($surveyid, $xmlwriter, $exclude=array())
         $query = "SELECT {{quota}}.*
         FROM {{quota}}
         WHERE {{quota}}.sid=$surveyid";
-        BuildXMLFromQuery($xmlwriter,$query);
+        buildXMLFromQuery($xmlwriter,$query);
 
         //1Quota members
         $query = "SELECT {{quota_members}}.*
         FROM {{quota_members}}
         WHERE {{quota_members}}.sid=$surveyid";
-        BuildXMLFromQuery($xmlwriter,$query);
+        buildXMLFromQuery($xmlwriter,$query);
 
         //Quota languagesettings
         $query = "SELECT {{quota_languagesettings}}.*
         FROM {{quota_languagesettings}}, {{quota}}
         WHERE {{quota}}.id = {{quota_languagesettings}}.quotals_quota_id
         AND {{quota}}.sid=$surveyid";
-        BuildXMLFromQuery($xmlwriter,$query);
+        buildXMLFromQuery($xmlwriter,$query);
     }
 
     // Surveys
@@ -646,26 +646,26 @@ function survey_getXMLStructure($surveyid, $xmlwriter, $exclude=array())
     FROM {{surveys}}
     WHERE sid=$surveyid";
     //Exclude some fields from the export
-    BuildXMLFromQuery($xmlwriter,$squery,'',array('owner_id','active','datecreated'));
+    buildXMLFromQuery($xmlwriter,$squery,'',array('owner_id','active','datecreated'));
 
     // Survey language settings
     $slsquery = "SELECT *
     FROM {{surveys_languagesettings}}
     WHERE surveyls_survey_id=$surveyid";
-    BuildXMLFromQuery($xmlwriter,$slsquery);
+    buildXMLFromQuery($xmlwriter,$slsquery);
 
     // Survey url parameters
     $slsquery = "SELECT *
     FROM {{survey_url_parameters}}
     WHERE sid={$surveyid}";
-    BuildXMLFromQuery($xmlwriter,$slsquery);
+    buildXMLFromQuery($xmlwriter,$slsquery);
 
 }
 
 /**
 * from export_structure_xml.php
 */
-function survey_getXMLData($surveyid, $exclude = array())
+function surveyGetXMLData($surveyid, $exclude = array())
 {
     $xml = getXMLWriter();
     $xml->openMemory();
@@ -682,7 +682,7 @@ function survey_getXMLData($surveyid, $exclude = array())
         $xml->writeElement('language',$surveylanguage);
     }
     $xml->endElement();
-    survey_getXMLStructure($surveyid, $xml,$exclude);
+    surveyGetXMLStructure($surveyid, $xml,$exclude);
     $xml->endElement(); // close columns
     $xml->endDocument();
     return $xml->outputMemory(true);
@@ -723,7 +723,7 @@ function getXMLDataSingleTable($iSurveyID, $sTableName, $sDocType, $sXMLTableTag
     $xml->endElement();
     $aquery = "SELECT * FROM {{{$sTableName}}}";
 
-    BuildXMLFromQuery($xml,$aquery, $sXMLTableTagName);
+    buildXMLFromQuery($xml,$aquery, $sXMLTableTagName);
     $xml->endElement(); // close columns
     $xml->endDocument();
     if ($sFileName='')
@@ -740,7 +740,7 @@ function getXMLDataSingleTable($iSurveyID, $sTableName, $sDocType, $sXMLTableTag
 /**
 * from export_structure_quexml.php
 */
-function quexml_cleanup($string)
+function QueXMLCleanup($string)
 {
     return trim(strip_tags(str_ireplace("<br />","\n",$string)));
 }
@@ -748,19 +748,19 @@ function quexml_cleanup($string)
 /**
 * from export_structure_quexml.php
 */
-function quexml_create_free($f,$len,$lab="")
+function QueXMLCreateFree($f,$len,$lab="")
 {
     global $dom;
     $free = $dom->create_element("free");
 
     $format = $dom->create_element("format");
-    $format->set_content(quexml_cleanup($f));
+    $format->set_content(QueXMLCleanup($f));
 
     $length = $dom->create_element("length");
-    $length->set_content(quexml_cleanup($len));
+    $length->set_content(QueXMLCleanup($len));
 
     $label = $dom->create_element("label");
-    $label->set_content(quexml_cleanup($lab));
+    $label->set_content(QueXMLCleanup($lab));
 
     $free->append_child($format);
     $free->append_child($length);
@@ -773,7 +773,7 @@ function quexml_create_free($f,$len,$lab="")
 /**
 * from export_structure_quexml.php
 */
-function quexml_fixed_array($array)
+function QueXMLFixedArray($array)
 {
     global $dom;
     $fixed = $dom->create_element("fixed");
@@ -783,10 +783,10 @@ function quexml_fixed_array($array)
         $category = $dom->create_element("category");
 
         $label = $dom->create_element("label");
-        $label->set_content(quexml_cleanup("$key"));
+        $label->set_content(QueXMLCleanup("$key"));
 
         $value= $dom->create_element("value");
-        $value->set_content(quexml_cleanup("$v"));
+        $value->set_content(QueXMLCleanup("$v"));
 
         $category->append_child($label);
         $category->append_child($value);
@@ -799,7 +799,7 @@ function quexml_fixed_array($array)
 }
 
 /**
-* Calculate if this item should have a quexml_skipto element attached to it
+* Calculate if this item should have a QueXMLSkipTo element attached to it
 *
 * from export_structure_quexml.php
 *
@@ -810,7 +810,7 @@ function quexml_fixed_array($array)
 * @author Adam Zammit <adam.zammit@acspri.org.au>
 * @since  2010-10-28
 */
-function quexml_skipto($qid,$value,$cfieldname = "")
+function QueXMLSkipTo($qid,$value,$cfieldname = "")
 {
     global $surveyid, $quexmllang;
     $qlang = new limesurvey_lang($quexmllang);
@@ -873,7 +873,7 @@ function quexml_skipto($qid,$value,$cfieldname = "")
 /**
 * from export_structure_quexml.php
 */
-function quexml_create_fixed($qid,$rotate=false,$labels=true,$scale=0,$other=false,$varname="")
+function QueXMLCreateFixed($qid,$rotate=false,$labels=true,$scale=0,$other=false,$varname="")
 {
     global $dom;
 
@@ -896,15 +896,15 @@ function quexml_create_fixed($qid,$rotate=false,$labels=true,$scale=0,$other=fal
         $category = $dom->create_element("category");
 
         $label = $dom->create_element("label");
-        $label->set_content(quexml_cleanup($Row['title']));
+        $label->set_content(QueXMLCleanup($Row['title']));
 
         $value= $dom->create_element("value");
-        $value->set_content(quexml_cleanup($Row['code']));
+        $value->set_content(QueXMLCleanup($Row['code']));
 
         $category->append_child($label);
         $category->append_child($value);
 
-        $st = quexml_skipto($qid,$Row['code']);
+        $st = QueXMLSkipTo($qid,$Row['code']);
         if ($st !== false)
         {
             $quexml_skipto = $dom->create_element("quexml_skipto");
@@ -998,20 +998,20 @@ function quexml_create_multi(&$question,$qid,$varname,$scale_id = false,$free =
             $category = $dom->create_element("category");
 
             $label = $dom->create_element("label");
-            $label->set_content(quexml_cleanup($Row['question']));
+            $label->set_content(QueXMLCleanup($Row['question']));
 
             $value= $dom->create_element("value");
-            //$value->set_content(quexml_cleanup($Row['title']));
+            //$value->set_content(QueXMLCleanup($Row['title']));
             $value->set_content("1");
             $nextcode = $Row['title'];
 
             $category->append_child($label);
             $category->append_child($value);
 
-            $st = quexml_skipto($qid,'Y'," AND c.cfieldname LIKE '+$surveyid" . "X" . $Row['gid'] . "X" . $qid . $Row['title'] . "' ");
+            $st = QueXMLSkipTo($qid,'Y'," AND c.cfieldname LIKE '+$surveyid" . "X" . $Row['gid'] . "X" . $qid . $Row['title'] . "' ");
             if ($st !== false)
             {
-                $quexml_skipto = $dom->create_element("quexml_skipto");
+                $quexml_skipto = $dom->create_element("QueXMLSkipTo");
                 $quexml_skipto->set_content($st);
                 $category->append_child($quexml_skipto);
             }
@@ -1022,9 +1022,9 @@ function quexml_create_multi(&$question,$qid,$varname,$scale_id = false,$free =
             $response->append_child($fixed);
         }
         else
-            $response->append_child(quexml_create_free($free['f'],$free['len'],$Row['question']));
+            $response->append_child(QueXMLCreateFree($free['f'],$free['len'],$Row['question']));
 
-        $response->set_attribute("varName",$varname . quexml_cleanup($Row['title']));
+        $response->set_attribute("varName",$varname . QueXMLCleanup($Row['title']));
 
         $question->append_child($response);
     }
@@ -1065,7 +1065,7 @@ function quexml_create_multi(&$question,$qid,$varname,$scale_id = false,$free =
 
         $fixed->append_child($category);
         $response->append_child($fixed);
-        $response->set_attribute("varName",$varname . quexml_cleanup($nextcode));
+        $response->set_attribute("varName",$varname . QueXMLCleanup($nextcode));
 
         $question->append_child($response);
     }
@@ -1094,9 +1094,9 @@ function quexml_create_subQuestions(&$question,$qid,$varname,$use_answers = fals
     {
         $subQuestion = $dom->create_element("subQuestion");
         $text = $dom->create_element("text");
-        $text->set_content(quexml_cleanup($Row['question']));
+        $text->set_content(QueXMLCleanup($Row['question']));
         $subQuestion->append_child($text);
-        $subQuestion->set_attribute("varName",$varname . quexml_cleanup($Row['title']));
+        $subQuestion->set_attribute("varName",$varname . QueXMLCleanup($Row['title']));
         $question->append_child($subQuestion);
     }
 
@@ -1125,7 +1125,7 @@ function quexml_export($surveyi, $quexmllan)
     $QueryResult = Yii::app()->db->createCommand($Query)->query();
     $Row = $QueryResult->read();
     $questionnaire->set_attribute("id", $Row['sid']);
-    $title->set_content(quexml_cleanup($Row['surveyls_title']));
+    $title->set_content(QueXMLCleanup($Row['surveyls_title']));
     $questionnaire->append_child($title);
 
     //investigator and datacollector
@@ -1146,7 +1146,7 @@ function quexml_export($surveyi, $quexmllan)
         $text = $dom->create_element("text");
         $administration = $dom->create_element("administration");
         $position->set_content("before");
-        $text->set_content(quexml_cleanup($Row['surveyls_welcometext']));
+        $text->set_content(QueXMLCleanup($Row['surveyls_welcometext']));
         $administration->set_content("self");
         $questionnaireInfo->append_child($position);
         $questionnaireInfo->append_child($text);
@@ -1174,7 +1174,7 @@ function quexml_export($surveyi, $quexmllan)
             $text = $dom->create_element("text");
             $administration = $dom->create_element("administration");
             $position->set_content("title");
-            $text->set_content(quexml_cleanup($Row['group_name']));
+            $text->set_content(QueXMLCleanup($Row['group_name']));
             $administration->set_content("self");
             $sectionInfo->append_child($position);
             $sectionInfo->append_child($text);
@@ -1190,7 +1190,7 @@ function quexml_export($surveyi, $quexmllan)
             $text = $dom->create_element("text");
             $administration = $dom->create_element("administration");
             $position->set_content("before");
-            $text->set_content(quexml_cleanup($Row['description']));
+            $text->set_content(QueXMLCleanup($Row['description']));
             $administration->set_content("self");
             $sectionInfo->append_child($position);
             $sectionInfo->append_child($text);
@@ -1213,7 +1213,7 @@ function quexml_export($surveyi, $quexmllan)
             $administration = $dom->create_element("administration");
 
             $position->set_content("before");
-            $text->set_content(quexml_cleanup($RowQ['question']));
+            $text->set_content(QueXMLCleanup($RowQ['question']));
             $administration->set_content("self");
             $sectionInfo->append_child($position);
             $sectionInfo->append_child($text);
@@ -1240,7 +1240,7 @@ function quexml_export($surveyi, $quexmllan)
             $questiontext = explode('<br />',$RowQ['question']);
             foreach ($questiontext as $qt)
             {
-                $txt = quexml_cleanup($qt);
+                $txt = QueXMLCleanup($qt);
                 if (!empty($txt))
                 {
                     $text = $dom->create_element("text");
@@ -1257,7 +1257,7 @@ function quexml_export($surveyi, $quexmllan)
                 $position = $dom->create_element("position");
                 $position->set_content("during");
                 $text = $dom->create_element("text");
-                $text->set_content(quexml_cleanup($RowQ['help']));
+                $text->set_content(QueXMLCleanup($RowQ['help']));
                 $administration = $dom->create_element("administration");
                 $administration->set_content("self");
 
@@ -1278,23 +1278,23 @@ function quexml_export($surveyi, $quexmllan)
 
                     break;
                 case "5": //5 POINT CHOICE radio-buttons
-                    $response->append_child(quexml_fixed_array(array("1" => 1,"2" => 2,"3" => 3,"4" => 4,"5" => 5)));
+                    $response->append_child(QueXMLFixedArray(array("1" => 1,"2" => 2,"3" => 3,"4" => 4,"5" => 5)));
                     $question->append_child($response);
                     break;
                 case "D": //DATE
-                    $response->append_child(quexml_create_free("date","8",""));
+                    $response->append_child(QueXMLCreateFree("date","8",""));
                     $question->append_child($response);
                     break;
                 case "L": //LIST drop-down/radio-button list
-                    $response->append_child(quexml_create_fixed($qid,false,false,0,$other,$sgq));
+                    $response->append_child(QueXMLCreateFixed($qid,false,false,0,$other,$sgq));
                     $question->append_child($response);
                     break;
                 case "!": //List - dropdown
-                    $response->append_child(quexml_create_fixed($qid,false,false,0,$other,$sgq));
+                    $response->append_child(QueXMLCreateFixed($qid,false,false,0,$other,$sgq));
                     $question->append_child($response);
                     break;
                 case "O": //LIST WITH COMMENT drop-down/radio-button list + textarea
-                    $response->append_child(quexml_create_fixed($qid,false,false,0,$other,$sgq));
+                    $response->append_child(QueXMLCreateFixed($qid,false,false,0,$other,$sgq));
                     $question->append_child($response);
                     //no comment - this should be a separate question
                     break;
@@ -1305,7 +1305,7 @@ function quexml_export($surveyi, $quexmllan)
                     //$QRE = mysql_query($Query) or die ("ERROR: $QRE<br />".mysql_error());
                     //$QROW = mysql_fetch_assoc($QRE);
                     $QROW = $QRE->read();
-                    $response->append_child(quexml_create_free("integer",strlen($QROW['sc']),""));
+                    $response->append_child(QueXMLCreateFree("integer",strlen($QROW['sc']),""));
                     $question->append_child($response);
                     break;
                 case "M": //Multiple choice checkbox
@@ -1318,78 +1318,78 @@ function quexml_export($surveyi, $quexmllan)
                     break;
                 case "Q": //MULTIPLE SHORT TEXT
                     quexml_create_subQuestions($question,$qid,$sgq);
-                    $response->append_child(quexml_create_free("text",quexml_get_lengthth($qid,"maximum_chars","10"),""));
+                    $response->append_child(QueXMLCreateFree("text",quexml_get_lengthth($qid,"maximum_chars","10"),""));
                     $question->append_child($response);
                     break;
                 case "K": //MULTIPLE NUMERICAL
                     quexml_create_subQuestions($question,$qid,$sgq);
-                    $response->append_child(quexml_create_free("integer",quexml_get_lengthth($qid,"maximum_chars","10"),""));
+                    $response->append_child(QueXMLCreateFree("integer",quexml_get_lengthth($qid,"maximum_chars","10"),""));
                     $question->append_child($response);
                     break;
                 case "N": //NUMERICAL QUESTION TYPE
-                    $response->append_child(quexml_create_free("integer",quexml_get_lengthth($qid,"maximum_chars","10"),""));
+                    $response->append_child(QueXMLCreateFree("integer",quexml_get_lengthth($qid,"maximum_chars","10"),""));
                     $question->append_child($response);
                     break;
                 case "S": //SHORT FREE TEXT
-                    $response->append_child(quexml_create_free("text",quexml_get_lengthth($qid,"maximum_chars","240"),""));
+                    $response->append_child(QueXMLCreateFree("text",quexml_get_lengthth($qid,"maximum_chars","240"),""));
                     $question->append_child($response);
                     break;
                 case "T": //LONG FREE TEXT
-                    $response->append_child(quexml_create_free("longtext",quexml_get_lengthth($qid,"display_rows","40"),""));
+                    $response->append_child(QueXMLCreateFree("longtext",quexml_get_lengthth($qid,"display_rows","40"),""));
                     $question->append_child($response);
                     break;
                 case "U": //HUGE FREE TEXT
-                    $response->append_child(quexml_create_free("longtext",quexml_get_lengthth($qid,"display_rows","80"),""));
+                    $response->append_child(QueXMLCreateFree("longtext",quexml_get_lengthth($qid,"display_rows","80"),""));
                     $question->append_child($response);
                     break;
                 case "Y": //YES/NO radio-buttons
-                    $response->append_child(quexml_fixed_array(array($qlang->gT("Yes") => 'Y',$qlang->gT("No") => 'N')));
+                    $response->append_child(QueXMLFixedArray(array($qlang->gT("Yes") => 'Y',$qlang->gT("No") => 'N')));
                     $question->append_child($response);
                     break;
                 case "G": //GENDER drop-down list
-                    $response->append_child(quexml_fixed_array(array($qlang->gT("Female") => 'F',$qlang->gT("Male") => 'M')));
+                    $response->append_child(QueXMLFixedArray(array($qlang->gT("Female") => 'F',$qlang->gT("Male") => 'M')));
                     $question->append_child($response);
                     break;
                 case "A": //ARRAY (5 POINT CHOICE) radio-buttons
                     quexml_create_subQuestions($question,$qid,$sgq);
-                    $response->append_child(quexml_fixed_array(array("1" => 1,"2" => 2,"3" => 3,"4" => 4,"5" => 5)));
+                    $response->append_child(QueXMLFixedArray(array("1" => 1,"2" => 2,"3" => 3,"4" => 4,"5" => 5)));
                     $question->append_child($response);
                     break;
                 case "B": //ARRAY (10 POINT CHOICE) radio-buttons
                     quexml_create_subQuestions($question,$qid,$sgq);
-                    $response->append_child(quexml_fixed_array(array("1" => 1,"2" => 2,"3" => 3,"4" => 4,"5" => 5,"6" => 6,"7" => 7,"8" => 8,"9" => 9,"10" => 10)));
+                    $response->append_child(QueXMLFixedArray(array("1" => 1,"2" => 2,"3" => 3,"4" => 4,"5" => 5,"6" => 6,"7" => 7,"8" => 8,"9" => 9,"10" => 10)));
                     $question->append_child($response);
                     break;
                 case "C": //ARRAY (YES/UNCERTAIN/NO) radio-buttons
                     quexml_create_subQuestions($question,$qid,$sgq);
-                    $response->append_child(quexml_fixed_array(array($qlang->gT("Yes") => 'Y',$qlang->gT("Uncertain") => 'U',$qlang->gT("No") => 'N')));
+                    $response->append_child(QueXMLFixedArray(array($qlang->gT("Yes") => 'Y',$qlang->gT("Uncertain") => 'U',$qlang->gT("No") => 'N')));
                     $question->append_child($response);
                     break;
                 case "E": //ARRAY (Increase/Same/Decrease) radio-buttons
                     quexml_create_subQuestions($question,$qid,$sgq);
-                    $response->append_child(quexml_fixed_array(array($qlang->gT("Increase") => 'I',$qlang->gT("Same") => 'S',$qlang->gT("Decrease") => 'D')));
+                    $response->append_child(QueXMLFixedArray(array($qlang->gT("Increase") => 'I',$qlang->gT("Same") => 'S',$qlang->gT("Decrease") => 'D')));
                     $question->append_child($response);
                     break;
                 case "F": //ARRAY (Flexible) - Row Format
                     //select subQuestions from answers table where QID
                     quexml_create_subQuestions($question,$qid,$sgq);
-                    $response->append_child(quexml_create_fixed($qid,false,false,0,$other,$sgq));
+                    $response->append_child(QueXMLCreateFixed($qid,false,false,0,$other,$sgq));
                     $question->append_child($response);
                     //select fixed responses from
                     break;
                 case "H": //ARRAY (Flexible) - Column Format
                     quexml_create_subQuestions($question,$RowQ['qid'],$sgq);
-                    $response->append_child(quexml_create_fixed($qid,true,false,0,$other,$sgq));
+                    $response->append_child(QueXMLCreateFixed($qid,true,false,0,$other,$sgq));
                     $question->append_child($response);
                     break;
                 case "1": //Dualscale multi-flexi array
                     //select subQuestions from answers table where QID
                     quexml_create_subQuestions($question,$qid,$sgq);
                     $response = $dom->create_element("response");
-                    $response->append_child(quexml_create_fixed($qid,false,false,0,$other,$sgq));
+                    $response->append_child(QueXMLCreateFixed($qid,false,false,0,$other,$sgq));
                     $response2 = $dom->create_element("response");
-                    $response2->set_attribute("varName",quexml_cleanup($sgq) . "_2");
-                    $response2->append_child(quexml_create_fixed($qid,false,false,1,$other,$sgq));
+                    $response2->set_attribute("varName",QueXMLCleanup($sgq) . "_2");
+                    $response2->append_child(QueXMLCreateFixed($qid,false,false,1,$other,$sgq));
                     $question->append_child($response);
                     $question->append_child($response2);
                     break;
@@ -1412,7 +1412,7 @@ function quexml_export($surveyi, $quexmllan)
                     quexml_create_multi($question,$qid,$sgq,1,array('f' => 'text', 'len' => 10, 'lab' => ''));
                     break;
                 case "^": //SLIDER CONTROL - not supported
-                    $response->append_child(quexml_fixed_array(array("NOT SUPPORTED:$type" => 1)));
+                    $response->append_child(QueXMLFixedArray(array("NOT SUPPORTED:$type" => 1)));
                     $question->append_child($response);
                     break;
             } //End Switch
@@ -1650,38 +1650,38 @@ function group_export($action, $surveyid, $gid)
         $xml->writeElement('language',$row->language);
     }
     $xml->endElement();
-    group_getXMLStructure($xml,$gid);
+    groupGetXMLStructure($xml,$gid);
     $xml->endElement(); // close columns
     $xml->endDocument();
     exit;
 }
 
-function group_getXMLStructure($xml,$gid)
+function groupGetXMLStructure($xml,$gid)
 {
     // Groups
     $gquery = "SELECT *
     FROM {{groups}}
     WHERE gid=$gid";
-    BuildXMLFromQuery($xml,$gquery);
+    buildXMLFromQuery($xml,$gquery);
 
     // Questions table
     $qquery = "SELECT *
     FROM {{questions}}
     WHERE gid=$gid and parent_qid=0 order by question_order, language, scale_id";
-    BuildXMLFromQuery($xml,$qquery);
+    buildXMLFromQuery($xml,$qquery);
 
     // Questions table - Subquestions
     $qquery = "SELECT *
     FROM {{questions}}
     WHERE gid=$gid and parent_qid>0 order by question_order, language, scale_id";
-    BuildXMLFromQuery($xml,$qquery,'subquestions');
+    buildXMLFromQuery($xml,$qquery,'subquestions');
 
     //Answers
     $aquery = "SELECT DISTINCT {{answers}}.*
     FROM {{answers}}, {{questions}}
     WHERE ({{answers}}.qid={{questions}}.qid)
     AND ({{questions}}.gid=$gid)";
-    BuildXMLFromQuery($xml,$aquery);
+    buildXMLFromQuery($xml,$aquery);
 
     //Conditions - THIS CAN ONLY EXPORT CONDITIONS THAT RELATE TO THE SAME GROUP
     $cquery = "SELECT DISTINCT c.*
@@ -1690,7 +1690,7 @@ function group_getXMLStructure($xml,$gid)
     AND (c.qid=b.qid)
     AND (q.gid={$gid})
     AND (b.gid={$gid})";
-    BuildXMLFromQuery($xml,$cquery,'conditions');
+    buildXMLFromQuery($xml,$cquery,'conditions');
 
     //Question attributes
     $surveyid=Yii::app()->db->createCommand("select sid from {{groups}} where gid={$gid}")->query()->read();
@@ -1708,7 +1708,7 @@ function group_getXMLStructure($xml,$gid)
         FROM {{question_attributes}} qa JOIN {{questions}}  q ON q.qid = qa.qid AND q.sid={$surveyid} and q.gid={$gid}
         where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value";
     }
-    BuildXMLFromQuery($xml,$query,'question_attributes');
+    buildXMLFromQuery($xml,$query,'question_attributes');
 
     // Default values
     $query = "SELECT dv.*
@@ -1717,7 +1717,7 @@ function group_getXMLStructure($xml,$gid)
     AND {{questions}}.language=dv.language
     AND {{questions}}.gid=$gid
     order by dv.language, dv.scale_id";
-    BuildXMLFromQuery($xml,$query,'defaultvalues');
+    buildXMLFromQuery($xml,$query,'defaultvalues');
 }
 
 
@@ -1727,8 +1727,7 @@ function group_getXMLStructure($xml,$gid)
 //  - Answers
 //  - Question attributes
 //  - Default values
-
-function question_export($action, $surveyid, $gid, $qid)
+function questionExport($action, $surveyid, $gid, $qid)
 {
     $fn = "limesurvey_question_$qid.lsq";
     $xml = getXMLWriter();
@@ -1764,32 +1763,32 @@ function question_export($action, $surveyid, $gid, $qid)
     $xml->writeElement('language',$questions->language);
 
     $xml->endElement();
-    question_getXMLStructure($xml,$gid,$qid);
+    questionGetXMLStructure($xml,$gid,$qid);
     $xml->endElement(); // close columns
     $xml->endDocument();
     exit;
 }
 
-function question_getXMLStructure($xml,$gid,$qid)
+function questionGetXMLStructure($xml,$gid,$qid)
 {
     // Questions table
     $qquery = "SELECT *
     FROM {{questions}}
     WHERE qid=$qid and parent_qid=0 order by language, scale_id, question_order";
-    BuildXMLFromQuery($xml,$qquery);
+    buildXMLFromQuery($xml,$qquery);
 
     // Questions table - Subquestions
     $qquery = "SELECT *
     FROM {{questions}}
     WHERE parent_qid=$qid order by language, scale_id, question_order";
-    BuildXMLFromQuery($xml,$qquery,'subquestions');
+    buildXMLFromQuery($xml,$qquery,'subquestions');
 
 
     // Answers table
     $aquery = "SELECT *
     FROM {{answers}}
     WHERE qid = $qid order by language, scale_id, sortorder";
-    BuildXMLFromQuery($xml,$aquery);
+    buildXMLFromQuery($xml,$aquery);
 
 
 
@@ -1810,18 +1809,18 @@ function question_getXMLStructure($xml,$gid,$qid)
         FROM {{question_attributes}} qa JOIN {{questions}}  q ON q.qid = qa.qid AND q.sid={$surveyid} and q.qid={$qid}
         where q.language='{$sBaseLanguage}' group by qa.qid, qa.attribute, qa.value";
     }
-    BuildXMLFromQuery($xml,$query);
+    buildXMLFromQuery($xml,$query);
 
     // Default values
     $query = "SELECT *
     FROM {{defaultvalues}}
     WHERE qid=$qid  order by language, scale_id";
-    BuildXMLFromQuery($xml,$query);
+    buildXMLFromQuery($xml,$query);
 
 }
 
 
-function tokens_export($surveyid)
+function tokensExport($surveyid)
 {
     header("Content-Disposition: attachment; filename=tokens_".$surveyid.".csv");
     header("Content-type: text/comma-separated-values; charset=UTF-8");
@@ -1938,7 +1937,7 @@ function tokens_export($surveyid)
     exit;
 }
 
-function cpdb_export($data,$filename)
+function CPDBExport($data,$filename)
 {
 
     header("Content-Disposition: attachment; filename=".$filename.".csv");
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
index b975873f476..39e6d21cdc5 100644
--- a/application/helpers/expressions/em_manager_helper.php
+++ b/application/helpers/expressions/em_manager_helper.php
@@ -190,7 +190,7 @@ public static function UpgradeConditionsToRelevance($surveyId=NULL, $qid=NULL)
         $queries = array();
         foreach ($releqns as $key=>$value) {
             $query = "UPDATE {{questions}} SET relevance='".addslashes($value)."' WHERE qid=".$key;
-            db_execute_assoc($query);
+            dbExecuteAssoc($query);
             $queries[] = $query;
         }
         // Cheat and upgrade question attributes here too.
@@ -215,7 +215,7 @@ public static function RevertUpgradeConditionsToRelevance($surveyId=NULL, $qid=N
 
         foreach ($releqns as $key=>$value) {
             $query = "UPDATE {{questions}} SET relevance=1 WHERE qid=".$key;
-            db_execute_assoc($query);
+            dbExecuteAssoc($query);
         }
         return count($releqns);
     }
@@ -2961,16 +2961,16 @@ private function _UpdateValuesInDatabase($updatedValues, $finished=false)
                     $thisstep = 1;
                     break;
             }
-            $setter[] = db_quote_id('lastpage') . "=" . dbQuoteAll($thisstep);
+            $setter[] = dbQuoteID('lastpage') . "=" . dbQuoteAll($thisstep);
 
             if ($this->surveyOptions['datestamp'] && isset($_SESSION['datestamp'])) {
-                $setter[] = db_quote_id('datestamp') . "=" . dbQuoteAll($_SESSION['datestamp']);
+                $setter[] = dbQuoteID('datestamp') . "=" . dbQuoteAll($_SESSION['datestamp']);
             }
             if ($this->surveyOptions['ipaddr'] && isset($_SERVER['REMOTE_ADDR'])) {
-                $setter[] = db_quote_id('ipaddr') . "=" . dbQuoteAll($_SERVER['REMOTE_ADDR']);
+                $setter[] = dbQuoteID('ipaddr') . "=" . dbQuoteAll($_SERVER['REMOTE_ADDR']);
             }
             if ($finished) {
-                $setter[] = db_quote_id('submitdate') . "=" . dbQuoteAll($_SESSION['datestamp']);
+                $setter[] = dbQuoteID('submitdate') . "=" . dbQuoteAll($_SESSION['datestamp']);
             }
 
             foreach ($updatedValues as $key=>$value)
@@ -2999,11 +2999,11 @@ private function _UpdateValuesInDatabase($updatedValues, $finished=false)
 
                 if (is_null($val))
                 {
-                    $setter[] = db_quote_id($key) . "=NULL";
+                    $setter[] = dbQuoteID($key) . "=NULL";
                 }
                 else
                 {
-                    $setter[] = db_quote_id($key) . "=" . dbQuoteAll($val);
+                    $setter[] = dbQuoteID($key) . "=" . dbQuoteAll($val);
                 }
             }
             $query .= implode(', ', $setter);
@@ -3013,7 +3013,7 @@ private function _UpdateValuesInDatabase($updatedValues, $finished=false)
             {
                 $query .= $_SESSION['srid'];
 
-                if (!db_execute_assoc($query))
+                if (!dbExecuteAssoc($query))
                 {
                     echo submitfailed('');  // TODO - report SQL error?
 
@@ -4920,7 +4920,7 @@ static function GetRelevanceAndTailoringJavaScript()
     static function GetSyntaxErrors()
     {
         $query = "SELECT * FROM {{expression_errors}}";
-        $data = db_execute_assoc($query);
+        $data = dbExecuteAssoc($query);
         return $data->readAll();
     }
 
@@ -4931,7 +4931,7 @@ static function ResetSyntaxErrorLog()
     {
         // truncate the table
         $query = "TRUNCATE TABLE {{expression_errors}}";
-        db_execute_assoc($query);
+        dbExecuteAssoc($query);
     }
 
     /**
@@ -5291,7 +5291,7 @@ private static function getConditionsForEM($surveyid=NULL, $qid=NULL)
                 ." c.cqid = 0 and c.qid = q.qid"
                 ." order by sid, qid, scenario, cqid, cfieldname, value";
 
-		$data = db_execute_assoc($query);
+		$data = dbExecuteAssoc($query);
 
 		return $data;
     }
@@ -5395,7 +5395,7 @@ private function getQuestionAttributesForEM($surveyid=NULL,$qid=NULL, $lang=NULL
                 .$lang
                 ." order by a.qid, a.attribute";
 
-        $data = db_execute_assoc($query);
+        $data = dbExecuteAssoc($query);
         $qattr = array();
 
         foreach($data->readAll() as $row) {
@@ -5447,7 +5447,7 @@ function getAnswerSetsForEM($surveyid=NULL,$qid=NULL,$lang=NULL)
             .$lang
             ." ORDER BY qid, scale_id, sortorder";
 
-        $data = db_execute_assoc($query);
+        $data = dbExecuteAssoc($query);
 
         $qans = array();
 
@@ -5482,7 +5482,7 @@ function getGroupInfoForEM($surveyid,$lang=NULL)
             .$lang
             ." ORDER BY group_order";
 
-        $data = db_execute_assoc($query);
+        $data = dbExecuteAssoc($query);
 
         $qinfo = array();
         foreach ($data->readAll() as $d)
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
index 70f5d169037..752f24a567a 100644
--- a/application/helpers/frontend_helper.php
+++ b/application/helpers/frontend_helper.php
@@ -50,7 +50,7 @@ function loadanswers()
     {
         return;
     }
-    $result = db_execute_assoc($query) or safeDie ("Error loading results<br />$query<br />");   //Checked
+    $result = dbExecuteAssoc($query) or safeDie ("Error loading results<br />$query<br />");   //Checked
     if ($result->count() < 1)
     {
         safeDie($clang->gT("There is no matching saved survey")."<br />\n");
@@ -338,7 +338,7 @@ function checkconfield($value)
 
         $scenarioquery = "SELECT DISTINCT scenario FROM {{conditions}}"
         ." WHERE {{conditions}}.qid=$sfa[0] ORDER BY scenario";
-        $scenarioresult=db_execute_assoc($scenarioquery);
+        $scenarioresult=dbExecuteAssoc($scenarioquery);
         $matchfound=0;
         //$scenario=1;
         //while ($scenario > 0)
@@ -360,7 +360,7 @@ function checkconfield($value)
             . "AND {{conditions}}.scenario=$scenario "
             . "AND {{conditions}}.cfieldname NOT LIKE '{%' "
             . "ORDER BY {{conditions}}.qid,{{conditions}}.cfieldname";
-            $result=db_execute_assoc($query) or safeDie($query."<br />");         //Checked
+            $result=dbExecuteAssoc($query) or safeDie($query."<br />");         //Checked
             $conditionsfound = $result->count();
 
             $querytoken = "SELECT {{conditions}}.*, '' as type "
@@ -370,7 +370,7 @@ function checkconfield($value)
             . "AND {{conditions}}.scenario=$scenario "
             . "AND {{conditions}}.cfieldname LIKE '{%' "
             . "ORDER BY {{conditions}}.qid,{{conditions}}.cfieldname";
-            $resulttoken=db_execute_assoc($querytoken) or safeDie($querytoken."<br />");         //Checked
+            $resulttoken=dbExecuteAssoc($querytoken) or safeDie($querytoken."<br />");         //Checked
             $conditionsfoundtoken = $resulttoken->count();
             $conditionsfound = $conditionsfound + $conditionsfoundtoken;
 
@@ -899,7 +899,7 @@ function aCheckInput($surveyid, $move,$backok=null)
                     ."FROM {{questions}}\n"
                     ."WHERE qid=".$fieldinfo['qid']." "
                     . "AND language='".$_SESSION['survey_'.$surveyid]['s_lang']."'";
-                    $pregresult=db_execute_assoc($pregquery) or safeDie("ERROR: $pregquery<br />");      //Checked
+                    $pregresult=dbExecuteAssoc($pregquery) or safeDie("ERROR: $pregquery<br />");      //Checked
                     foreach($pregresult->readAll() as $pregrow)
                     {
                         $preg=trim($pregrow['preg']);
@@ -1046,7 +1046,7 @@ function submittokens($quotaexit=false)
 
     // check how many uses the token has left
     $usesquery = "SELECT usesleft FROM {{tokens_$surveyid}} WHERE token=".$clienttoken;
-    $usesresult = db_execute_assoc($usesquery);
+    $usesresult = dbExecuteAssoc($usesquery);
     $usesrow = $usesresult->read();
     if (isset($usesrow)) { $usesleft = $usesrow['usesleft']; }
 
@@ -1079,14 +1079,14 @@ function submittokens($quotaexit=false)
     }
     $utquery .= "WHERE token=".$clienttoken."";
 
-    $utresult = db_execute_assoc($utquery) or safeDie ("Couldn't update tokens table!<br />\n$utquery<br />\n");     //Checked
+    $utresult = dbExecuteAssoc($utquery) or safeDie ("Couldn't update tokens table!<br />\n$utquery<br />\n");     //Checked
 
     if ($quotaexit==false)
     {
         // TLR change to put date into sent and completed
         $cnfquery = "SELECT * FROM {{tokens_$surveyid}} WHERE token=".$clienttoken." AND completed!='N' AND completed!=''";
 
-        $cnfresult = db_execute_assoc($cnfquery);       //Checked
+        $cnfresult = dbExecuteAssoc($cnfquery);       //Checked
         $cnfrow = $cnfresult->read();
         if (isset($cnfrow))
         {
@@ -1227,7 +1227,7 @@ function SendSubmitNotifications()
 
     if (!empty($thissurvey['emailresponseto']))
     {
-        if (isset($_SESSION['survey_'.$surveyid]['token']) && $_SESSION['survey_'.$surveyid]['token'] != '' && db_tables_exist('{{tokens_'.$surveyid.'}}'))
+        if (isset($_SESSION['survey_'.$surveyid]['token']) && $_SESSION['survey_'.$surveyid]['token'] != '' && tableExists('{{tokens_'.$surveyid.'}}'))
         {
             //Gather token data for tokenised surveys
             $_SESSION['survey_'.$surveyid]['thistoken']=getTokenData($surveyid, $_SESSION['survey_'.$surveyid]['token']);
@@ -1548,7 +1548,7 @@ function buildsurveysession($surveyid,$previewGroup=false)
             $tkquery = "SELECT COUNT(*) FROM {{tokens_".$surveyid."}} WHERE token=".trim(strip_tags($clienttoken))." AND (completed = 'N' or completed='')";
         }
 
-        $tkresult = db_execute_assoc($tkquery);    //Checked
+        $tkresult = dbExecuteAssoc($tkquery);    //Checked
         $tkexist = reset($tkresult->read());
         if (!$tkexist || $areTokensUsed)
         {
@@ -1593,7 +1593,7 @@ function buildsurveysession($surveyid,$previewGroup=false)
             {
                 $tkquery = "SELECT COUNT(*) FROM {{tokens_".$surveyid."}} WHERE token='".trim(sanitize_xss_string(strip_tags($clienttoken)))."' AND (completed = 'N' or completed='')";
             }
-            $tkresult = db_execute_assoc($tkquery);     //Checked
+            $tkresult = dbExecuteAssoc($tkquery);     //Checked
             list($tkexist) = $tkresult->read();
             if (!$tkexist || ($areTokensUsed && $thissurvey['alloweditaftercompletion'] != 'Y') )
             {
@@ -1716,13 +1716,13 @@ function buildsurveysession($surveyid,$previewGroup=false)
 
 
     //RL: multilingual support
-    if (isset($_GET['token']) && db_tables_exist('{{tokens_'.$surveyid.'}}'))
+    if (isset($_GET['token']) && tableExists('{{tokens_'.$surveyid.'}}'))
     {
 
         //get language from token (if one exists)
         $tkquery2 = "SELECT * FROM {{tokens_".$surveyid."}} WHERE token='".db_quote($clienttoken)."' AND (completed = 'N' or completed='')";
         //echo $tkquery2;
-        $result = db_execute_assoc($tkquery2) or safeDie ("Couldn't get tokens<br />$tkquery<br />");    //Checked
+        $result = dbExecuteAssoc($tkquery2) or safeDie ("Couldn't get tokens<br />$tkquery<br />");    //Checked
         foreach ($result->readAll() as $rw)
         {
             $tklanguage=$rw['language'];
@@ -1765,7 +1765,7 @@ function buildsurveysession($surveyid,$previewGroup=false)
     ." AND {{questions}}.parent_qid=0\n"
     ." ORDER BY {{groups}}.group_order,{{questions}}.question_order";
 
-    $result = db_execute_assoc($query);    //Checked
+    $result = dbExecuteAssoc($query);    //Checked
 
     $totalquestions = $result->count();
 
@@ -1824,7 +1824,7 @@ function buildsurveysession($surveyid,$previewGroup=false)
         $_SESSION['survey_'.$surveyid]['insertarray'][]= "token";
     }
 
-    if ($tokensexist == 1 && $thissurvey['anonymized'] == "N"  && db_tables_exist('{{tokens_'.$surveyid.'}}'))
+    if ($tokensexist == 1 && $thissurvey['anonymized'] == "N"  && tableExists('{{tokens_'.$surveyid.'}}'))
     {
         //Gather survey data for "non anonymous" surveys, for use in presenting questions
         $_SESSION['survey_'.$surveyid]['thistoken']=getTokenData($surveyid, $clienttoken);
@@ -1912,7 +1912,7 @@ function buildsurveysession($surveyid,$previewGroup=false)
     {
         $rgquery = "SELECT attr.qid, value FROM {{question_attributes}} as attr right join {{questions}} as quests on attr.qid=quests.qid WHERE attribute='random_group' and value <> '' and sid=$surveyid GROUP BY attr.qid, value";
     }
-    $rgresult = db_execute_assoc($rgquery);
+    $rgresult = dbExecuteAssoc($rgquery);
     foreach($rgresult->readAll() as $rgrow)
     {
         // Get the question IDs for each randomization group
@@ -2073,7 +2073,7 @@ function buildsurveysession($surveyid,$previewGroup=false)
     }
 
     // Fix totalquestions by substracting Test Display questions
-    $iNumberofQuestions=db_execute_assoc("SELECT count(*)\n"
+    $iNumberofQuestions=dbExecuteAssoc("SELECT count(*)\n"
     ." FROM {{questions}}"
     ." WHERE type in ('X','*')\n"
     ." AND sid={$surveyid}"
@@ -2184,7 +2184,7 @@ function doAssessment($surveyid, $returndataonly=false)
     $query = "SELECT * FROM {{assessments}}
     WHERE sid=$surveyid and language='{$_SESSION['survey_'.$surveyid]['s_lang']}'
     ORDER BY scope, id";
-    if ($result = db_execute_assoc($query))   //Checked
+    if ($result = dbExecuteAssoc($query))   //Checked
 
     {
         if ($result->count() > 0)
@@ -2227,7 +2227,7 @@ function doAssessment($surveyid, $returndataonly=false)
                         {
 
                             $usquery = "SELECT assessment_value FROM {{answers}} where qid=".$field['qid']." and language='$baselang' and code=".dbQuoteAll($_SESSION['survey_'.$surveyid][$field['fieldname']]);
-                            $usresult = db_execute_assoc($usquery);          //Checked
+                            $usresult = dbExecuteAssoc($usquery);          //Checked
                             if ($usresult)
                             {
                                 $usrow = $usresult->read();
@@ -2343,7 +2343,7 @@ function UpdateGroupList($surveyid, $language)
     $clang = Yii::app()->lang;
     unset ($_SESSION['survey_'.$surveyid]['grouplist']);
     $query = "SELECT * FROM {{groups}} WHERE sid=$surveyid AND language='".$language."' ORDER BY group_order";
-    $result = db_execute_assoc($query) or safeDie ("Couldn't get group list<br />$query<br />");  //Checked
+    $result = dbExecuteAssoc($query) or safeDie ("Couldn't get group list<br />$query<br />");  //Checked
     foreach ($result->readAll() as $row)
     {
         $_SESSION['survey_'.$surveyid]['grouplist'][$row['gid']]=array($row['gid'], $row['group_name'], $row['description']);
@@ -2379,7 +2379,7 @@ function UpdateFieldArray()
             $questionarray =& $_SESSION['survey_'.$surveyid]['fieldarray'][$key];
 
             $query = "SELECT * FROM {{questions}} WHERE qid=".$questionarray[0]." AND language='".$_SESSION['survey_'.$surveyid]['s_lang']."'";
-            $result = db_execute_assoc($query) or safeDie ("Couldn't get question <br />$query<br />");      //Checked
+            $result = dbExecuteAssoc($query) or safeDie ("Couldn't get question <br />$query<br />");      //Checked
             $row = $result->read();
             $questionarray[2]=$row['title'];
             $questionarray[3]=$row['question'];
@@ -2436,7 +2436,7 @@ function check_quota($checkaction,$surveyid)
                             $fields_query_array[$fieldname] = array();
                         }
                         $fields_value_array[$fieldname][]=$member['value'];
-                        $fields_query_array[$fieldname][]= db_quote_id($fieldname)." = '{$member['value']}'";
+                        $fields_query_array[$fieldname][]= dbQuoteID($fieldname)." = '{$member['value']}'";
                     }
 
                 }
@@ -2487,7 +2487,7 @@ function check_quota($checkaction,$surveyid)
                     WHERE ".implode(' AND ',$querycond)." "."
                     AND submitdate IS NOT NULL";
 
-                    $result = db_execute_assoc($querysel) or safeDie();    //Checked
+                    $result = dbExecuteAssoc($querysel) or safeDie();    //Checked
                     $quota_check = $result->readAll();
 
                     if ($result->count() >= $quota['Limit']) // Quota is full!!
@@ -2756,7 +2756,7 @@ function UpdateSessionGroupList($surveyid, $language)
 {
     unset ($_SESSION['survey_'.$surveyid]['grouplist']);
     $query = "SELECT * FROM {{groups}} WHERE sid={$surveyid} AND language='".$language."' ORDER BY group_order";
-    $result = db_execute_assoc($query) or safeDie ("Couldn't get group list<br />$query<br />".$connect->ErrorMsg());  //Checked
+    $result = dbExecuteAssoc($query) or safeDie ("Couldn't get group list<br />$query<br />".$connect->ErrorMsg());  //Checked
     foreach($result->readAll() as $row)
     {
         $_SESSION['survey_'.$surveyid]['grouplist'][]=array($row['gid'], $row['group_name'], $row['description']);
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index 31607cd6554..9d487ea9fb9 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -1364,7 +1364,7 @@ function do_list_dropdown($ia)
     //question attribute random order set?
     if ($aQuestionAttributes['random_order']==1)
     {
-        $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".dbRandom();
     }
     //question attribute alphasort set?
     elseif ($aQuestionAttributes['alphasort']==1)
@@ -1641,7 +1641,7 @@ function do_list_radio($ia)
 
     //question attribute random order set?
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".dbRandom();
     }
 
     //question attribute alphasort set?
@@ -1656,7 +1656,7 @@ function do_list_radio($ia)
         $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY sortorder, answer";
     }
 
-    $ansresult = db_execute_assoc($ansquery)->readAll();  //Checked
+    $ansresult = dbExecuteAssoc($ansquery)->readAll();  //Checked
     $anscount = count($ansresult);
 
     if (trim($aQuestionAttributes['display_columns'])!='') {
@@ -1899,7 +1899,7 @@ function do_listwithcomment($ia)
 
     //question attribute random order set?
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".dbRandom();
     }
     //question attribute alphasort set?
     elseif ($aQuestionAttributes['alphasort']==1)
@@ -2066,7 +2066,7 @@ function do_ranking($ia)
     $aQuestionAttributes = getQuestionAttributeValues($ia[0], $ia[4]);
     $answer = '';
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".dbRandom();
     } else {
         $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY sortorder, answer";
     }
@@ -2407,18 +2407,18 @@ function do_multiplechoice($ia)
     //    }
 
     $qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and parent_qid=0";
-    $qresult = db_execute_assoc($qquery);     //Checked
+    $qresult = dbExecuteAssoc($qquery);     //Checked
     $qrow = $qresult->read(); $other = $qrow['other'];
 
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     }
     else
     {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
     }
 
-    $ansresult = db_execute_assoc($ansquery)->readAll();  //Checked
+    $ansresult = dbExecuteAssoc($ansquery)->readAll();  //Checked
     $anscount = count($ansresult);
 
     if (trim($aQuestionAttributes['exclude_all_others'])!='' && $aQuestionAttributes['random_order']==1)
@@ -2792,7 +2792,7 @@ function do_multiplechoice_withcomments($ia)
     $qresult = Yii::app()->db->createCommand($qquery)->query();     //Checked
     $qrow = $qresult->read(); $other = $qrow['other'];
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     } else {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
     }
@@ -3210,14 +3210,14 @@ function do_multipleshorttext($ia)
     }
 
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     }
     else
     {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
     }
 
-    $ansresult = db_execute_assoc($ansquery);    //Checked
+    $ansresult = dbExecuteAssoc($ansquery);    //Checked
     $anscount = $ansresult->count()*2;
     //$answer .= "\t<input type='hidden' name='MULTI$ia[1]' value='$anscount'>\n";
     $fn = 1;
@@ -3520,14 +3520,14 @@ function do_multiplenumeric($ia)
 
     if ($aQuestionAttributes['random_order']==1)
     {
-        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     }
     else
     {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0]  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
     }
 
-    $ansresult = db_execute_assoc($ansquery);	//Checked
+    $ansresult = dbExecuteAssoc($ansquery);	//Checked
     $anscount = $ansresult->count()*2;
     //$answer .= "\t<input type='hidden' name='MULTI$ia[1]' value='$anscount'>\n";
     $fn = 1;
@@ -4458,21 +4458,21 @@ function do_array_5point($ia)
     $cellwidth = round((( 100 - $answerwidth ) / $cellwidth) , 1); // convert number of columns to percentage of table width
 
     $ansquery = "SELECT question FROM {{questions}} WHERE parent_qid=".$ia[0]." AND question like '%|%'";
-    $ansresult = db_execute_assoc($ansquery);   //Checked
+    $ansresult = dbExecuteAssoc($ansquery);   //Checked
 
     if ($ansresult->count()>0) {$right_exists=true;$answerwidth=$answerwidth/2;} else {$right_exists=false;}
     // $right_exists is a flag to find out if there are any right hand answer parts. If there arent we can leave out the right td column
 
 
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     }
     else
     {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
     }
 
-    $ansresult = db_execute_assoc($ansquery);     //Checked
+    $ansresult = dbExecuteAssoc($ansquery);     //Checked
     $anscount = $ansresult->count();
 
     $fn = 1;
@@ -4610,7 +4610,7 @@ function do_array_10point($ia)
     }
 
     $qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]."  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
-    $qresult = db_execute_assoc($qquery);      //Checked
+    $qresult = dbExecuteAssoc($qquery);      //Checked
     $qrow = $qresult->read(); $other = $qrow['other'];
 
     $aQuestionAttributes = getQuestionAttributeValues($ia[0], $ia[4]);
@@ -4630,13 +4630,13 @@ function do_array_10point($ia)
     $cellwidth = round((( 100 - $answerwidth ) / $cellwidth) , 1); // convert number of columns to percentage of table width
 
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     }
     else
     {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
     }
-    $ansresult = db_execute_assoc($ansquery);   //Checked
+    $ansresult = dbExecuteAssoc($ansquery);   //Checked
     $anscount = $ansresult->count();
 
     $fn = 1;
@@ -4746,7 +4746,7 @@ function do_array_yesnouncertain($ia)
     }
 
     $qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
-    $qresult = db_execute_assoc($qquery);	//Checked
+    $qresult = dbExecuteAssoc($qquery);	//Checked
     $qrow = $qresult->readAll();
     $other = isset($qrow['other']) ? $qrow['other'] : '';
     $aQuestionAttributes=getQuestionAttributeValues($ia[0],$ia[4]);
@@ -4766,13 +4766,13 @@ function do_array_yesnouncertain($ia)
     $cellwidth = round((( 100 - $answerwidth ) / $cellwidth) , 1); // convert number of columns to percentage of table width
 
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     }
     else
     {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
     }
-    $ansresult = db_execute_assoc($ansquery);	//Checked
+    $ansresult = dbExecuteAssoc($ansquery);	//Checked
     $anscount = $ansresult->count();
     $fn = 1;
     $answer = "\n<table class=\"question\" summary=\"".str_replace('"','' ,strip_tags($ia[3]))." - a Yes/No/uncertain Likert scale array\">\n"
@@ -4906,7 +4906,7 @@ function do_array_increasesamedecrease($ia)
     }
 
     $qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
-    $qresult = db_execute_assoc($qquery);   //Checked
+    $qresult = dbExecuteAssoc($qquery);   //Checked
     $aQuestionAttributes = getQuestionAttributeValues($ia[0], $ia[4]);
     if (trim($aQuestionAttributes['answer_width'])!='')
     {
@@ -4928,13 +4928,13 @@ function do_array_increasesamedecrease($ia)
         $other = $qrow['other'];
     }
     if ($aQuestionAttributes['random_order']==1) {
-        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+        $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     }
     else
     {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
     }
-    $ansresult = db_execute_assoc($ansquery);  //Checked
+    $ansresult = dbExecuteAssoc($ansquery);  //Checked
     $anscount = $ansresult->count();
 
     $fn = 1;
@@ -5081,7 +5081,7 @@ function do_array($ia)
     }
 
     $qquery = "SELECT other FROM {{questions}} WHERE qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
-    $qresult = db_execute_assoc($qquery);     //Checked
+    $qresult = dbExecuteAssoc($qquery);     //Checked
     $qrow = $qresult->read(); $other = $qrow['other'];
     $lquery = "SELECT * FROM {{answers}} WHERE qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY sortorder, code";
 
@@ -5105,7 +5105,7 @@ function do_array($ia)
         $useDropdownLayout = false;
     }
 
-    $lresult = db_execute_assoc($lquery);   //Checked
+    $lresult = dbExecuteAssoc($lquery);   //Checked
     if ($useDropdownLayout === false && $lresult->count() > 0)
     {
         foreach ($lresult->readAll() as $lrow)
@@ -5117,17 +5117,17 @@ function do_array($ia)
         //		$cellwidth=sprintf('%02d', $cellwidth);
 
         $ansquery = "SELECT question FROM {{questions}} WHERE parent_qid={$ia[0]} AND question like '%|%' ";
-        $ansresult = db_execute_assoc($ansquery);  //Checked
+        $ansresult = dbExecuteAssoc($ansquery);  //Checked
         if ($ansresult->count()>0) {$right_exists=true;$answerwidth=$answerwidth/2;} else {$right_exists=false;}
         // $right_exists is a flag to find out if there are any right hand answer parts. If there arent we can leave out the right td column
         if ($aQuestionAttributes['random_order']==1) {
-            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
         }
         else
         {
             $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
         }
-        $ansresult = db_execute_assoc($ansquery); //Checked
+        $ansresult = dbExecuteAssoc($ansquery); //Checked
         $anscount = $ansresult->count();
         $fn=1;
 
@@ -5295,17 +5295,17 @@ function do_array($ia)
             $labels[]=Array('code' => $lrow['code'],
             'answer' => $lrow['answer']);
         $ansquery = "SELECT question FROM {{questions}} WHERE parent_qid={$ia[0]} AND question like '%|%' ";
-        $ansresult = db_execute_assoc($ansquery);  //Checked
+        $ansresult = dbExecuteAssoc($ansquery);  //Checked
         if ($ansresult->count()>0) {$right_exists=true;$answerwidth=$answerwidth/2;} else {$right_exists=false;}
         // $right_exists is a flag to find out if there are any right hand answer parts. If there arent we can leave out the right td column
         if ($aQuestionAttributes['random_order']==1) {
-            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
         }
         else
         {
             $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
         }
-        $ansresult = db_execute_assoc($ansquery); //Checked
+        $ansresult = dbExecuteAssoc($ansquery); //Checked
         $anscount = $ansresult->count();
         $fn=1;
 
@@ -5598,7 +5598,7 @@ function do_array_multitext($ia)
         $cellwidth=sprintf('%02d', $cellwidth);
 
         $ansquery = "SELECT count(question) FROM {{questions}} WHERE parent_qid={$ia[0]} and scale_id=0 AND question like '%|%'";
-        $ansresult = reset(db_execute_assoc($ansquery)->read());
+        $ansresult = reset(dbExecuteAssoc($ansquery)->read());
         if ($ansresult>0)
         {
             $right_exists=true;
@@ -5610,13 +5610,13 @@ function do_array_multitext($ia)
         }
         // $right_exists is a flag to find out if there are any right hand answer parts. If there arent we can leave out the right td column
         if ($aQuestionAttributes['random_order']==1) {
-            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] and scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] and scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
         }
         else
         {
             $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] and scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
         }
-        $ansresult = db_execute_assoc($ansquery);
+        $ansresult = dbExecuteAssoc($ansquery);
         $anscount = $ansresult->count();
         $fn=1;
 
@@ -5789,7 +5789,7 @@ function do_array_multiflexi($ia)
     //echo '<pre>'; print_r($_POST); echo '</pre>';
     $defaultvaluescript = '';
     $qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and parent_qid=0";
-    $qresult = db_execute_assoc($qquery);
+    $qresult = dbExecuteAssoc($qquery);
     $qrow = $qresult->read(); $other = $qrow['other'];
 
     $aQuestionAttributes = getQuestionAttributeValues($ia[0], $ia[4]);
@@ -5878,7 +5878,7 @@ function do_array_multiflexi($ia)
     $columnswidth=100-($answerwidth*2);
 
     $lquery = "SELECT * FROM {{questions}} WHERE parent_qid={$ia[0]}  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=1 ORDER BY question_order";
-    $lresult = db_execute_assoc($lquery);
+    $lresult = dbExecuteAssoc($lquery);
     if ($lresult->count() > 0)
     {
         foreach ($lresult->readAll() as $lrow)
@@ -5893,17 +5893,17 @@ function do_array_multiflexi($ia)
         $cellwidth=sprintf('%02d', $cellwidth);
 
         $ansquery = "SELECT question FROM {{questions}} WHERE parent_qid=".$ia[0]." AND scale_id=0 AND question like '%|%'";
-        $ansresult = db_execute_assoc($ansquery);
+        $ansresult = dbExecuteAssoc($ansquery);
         if ($ansresult->count()>0) {$right_exists=true;$answerwidth=$answerwidth/2;} else {$right_exists=false;}
         // $right_exists is a flag to find out if there are any right hand answer parts. If there arent we can leave out the right td column
         if ($aQuestionAttributes['random_order']==1) {
-            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
         }
         else
         {
             $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
         }
-        $ansresult = db_execute_assoc($ansquery)->readAll();  //Checked
+        $ansresult = dbExecuteAssoc($ansquery)->readAll();  //Checked
         if (trim($aQuestionAttributes['parent_order']!=''))
         {
             $iParentQID=(int) $aQuestionAttributes['parent_order'];
@@ -6142,10 +6142,10 @@ function do_arraycolumns($ia)
 
     $aQuestionAttributes = getQuestionAttributeValues($ia[0], $ia[4]);
     $qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
-    $qresult = db_execute_assoc($qquery);    //Checked
+    $qresult = dbExecuteAssoc($qquery);    //Checked
     $qrow = $qresult->read(); $other = $qrow['other'];
     $lquery = "SELECT * FROM {{answers}} WHERE qid=".$ia[0]."  AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY sortorder, code";
-    $lresult = db_execute_assoc($lquery);   //Checked
+    $lresult = dbExecuteAssoc($lquery);   //Checked
     if ($lresult->count() > 0)
     {
         foreach ($lresult->readAll() as $lrow)
@@ -6161,13 +6161,13 @@ function do_arraycolumns($ia)
             $labels[]=array('answer'=>$clang->gT('No answer'), 'code'=>'');
         }
         if ($aQuestionAttributes['random_order']==1) {
-            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
         }
         else
         {
             $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
         }
-        $ansresult = db_execute_assoc($ansquery);  //Checked
+        $ansresult = dbExecuteAssoc($ansquery);  //Checked
         $anscount = $ansresult->count();
         if ($anscount>0)
         {
@@ -6302,7 +6302,7 @@ function do_array_dual($ia)
     $labelans1=array();
     $labelans=array();
     $qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
-    $other = reset(db_execute_assoc($qquery)->read());    //Checked
+    $other = reset(dbExecuteAssoc($qquery)->read());    //Checked
     $lquery =  "SELECT * FROM {{answers}} WHERE scale_id=0 AND qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY sortorder, code";
     $lquery1 = "SELECT * FROM {{answers}} WHERE scale_id=1 AND qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY sortorder, code";
     $aQuestionAttributes = getQuestionAttributeValues($ia[0], $ia[4]);
@@ -6333,7 +6333,7 @@ function do_array_dual($ia)
         $rightheader ='';
     }
 
-    $lresult = db_execute_assoc($lquery); //Checked
+    $lresult = dbExecuteAssoc($lquery); //Checked
     if ($useDropdownLayout === false && $lresult->count() > 0)
     {
         if (trim($aQuestionAttributes['answer_width'])!='')
@@ -6351,7 +6351,7 @@ function do_array_dual($ia)
             $labelans[]=$lrow['answer'];
             $labelcode[]=$lrow['code'];
         }
-        $lresult1 = db_execute_assoc($lquery1); //Checked
+        $lresult1 = dbExecuteAssoc($lquery1); //Checked
         if ($lresult1->count() > 0)
         {
             foreach ($lresult1->readAll() as $lrow1)
@@ -6367,7 +6367,7 @@ function do_array_dual($ia)
         $cellwidth=sprintf("%02d", $cellwidth);
 
         $ansquery = "SELECT question FROM {{questions}} WHERE parent_qid=".$ia[0]." and scale_id=0 AND question like '%|%'";
-        $ansresult = db_execute_assoc($ansquery);   //Checked
+        $ansresult = dbExecuteAssoc($ansquery);   //Checked
         if ($ansresult->count()>0)
         {
             $right_exists=true;
@@ -6378,13 +6378,13 @@ function do_array_dual($ia)
         }
         // $right_exists is a flag to find out if there are any right hand answer parts. If there arent we can leave out the right td column
         if ($aQuestionAttributes['random_order']==1) {
-            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".db_random();
+            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".dbRandom();
         }
         else
         {
             $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY question_order";
         }
-        $ansresult = db_execute_assoc($ansquery);   //Checked
+        $ansresult = dbExecuteAssoc($ansquery);   //Checked
         $anscount = $ansresult->count();
         $fn=1;
         // unselect second scale when using "no answer"
@@ -6665,7 +6665,7 @@ function do_array_dual($ia)
 
         //question atribute random_order set?
         if ($aQuestionAttributes['random_order']==1) {
-            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] and scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".db_random();
+            $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] and scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
         }
 
         //no question attributes -> order by sortorder
@@ -6673,7 +6673,7 @@ function do_array_dual($ia)
         {
             $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] and scale_id=0 AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY question_order";
         }
-        $ansresult = db_execute_assoc($ansquery);    //Checked
+        $ansresult = dbExecuteAssoc($ansquery);    //Checked
         $anscount = $ansresult->count();
 
         if ($anscount==0)
@@ -6684,13 +6684,13 @@ function do_array_dual($ia)
         else
         {
 
-            //already done $lresult = db_execute_assoc($lquery);
+            //already done $lresult = dbExecuteAssoc($lquery);
             foreach ($lresult->readAll() as $lrow)
             {
                 $labels0[]=Array('code' => $lrow['code'],
                 'title' => $lrow['answer']);
             }
-            $lresult1 = db_execute_assoc($lquery1);   //Checked
+            $lresult1 = dbExecuteAssoc($lquery1);   //Checked
             foreach ($lresult1->readAll() as $lrow1)
             {
                 $labels1[]=Array('code' => $lrow1['code'],
diff --git a/application/helpers/update/upgrade-all_helper.php b/application/helpers/update/upgrade-all_helper.php
index 26c81229cd0..709e97f20df 100644
--- a/application/helpers/update/upgrade-all_helper.php
+++ b/application/helpers/update/upgrade-all_helper.php
@@ -110,14 +110,14 @@ function upgrade_question_attributes148()
 {
     global $modifyoutput;
     $sSurveyQuery = "SELECT sid FROM {{surveys}}";
-    $oSurveyResult = db_execute_assoc($sSurveyQuery);
+    $oSurveyResult = dbExecuteAssoc($sSurveyQuery);
     foreach ( $oSurveyResult->readAll()  as $aSurveyRow)
     {
         $surveyid=$aSurveyRow['sid'];
         $languages=array_merge(array(Survey::model()->findByPk($surveyid)->language), Survey::model()->findByPk($surveyid)->additionalLanguages);
 
         $sAttributeQuery = "select q.qid,attribute,value from {{question_attributes}} qa , {{questions}} q where q.qid=qa.qid and sid={$surveyid}";
-        $oAttributeResult = db_execute_assoc($sAttributeQuery);
+        $oAttributeResult = dbExecuteAssoc($sAttributeQuery);
         $aAllAttributes=questionAttributes(true);
         foreach ( $oAttributeResult->readAll() as $aAttributeRow)
         {
@@ -138,7 +138,7 @@ function upgrade_survey_table145()
 {
     global $modifyoutputt;
     $sSurveyQuery = "SELECT * FROM {{surveys}} where notification<>'0'";
-    $oSurveyResult = db_execute_assoc($sSurveyQuery);
+    $oSurveyResult = dbExecuteAssoc($sSurveyQuery);
     foreach ( $oSurveyResult->readAll() as $aSurveyRow )
     {
         if ($aSurveyRow['notification']=='1' && trim($aSurveyRow['adminemail'])!='')
diff --git a/application/helpers/update/upgrade-mssql_helper.php b/application/helpers/update/upgrade-mssql_helper.php
index a7a0910969c..d2f3b11708d 100644
--- a/application/helpers/update/upgrade-mssql_helper.php
+++ b/application/helpers/update/upgrade-mssql_helper.php
@@ -578,7 +578,7 @@ function upgrade_survey_tables117()
 function upgrade_survey_tables118()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like('tokens');
+    $tokentables = dbGetTablesLike('tokens');
     foreach ($tokentables as $sv)
     {
         modifyDatabase("","ALTER TABLE ".$sv." ALTER COLUMN [token] VARCHAR(36)"); echo $modifyoutput; flush();ob_flush();
@@ -589,7 +589,7 @@ function upgrade_survey_tables118()
 function upgrade_token_tables125()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like('tokens');
+    $tokentables = dbGetTablesLike('tokens');
     foreach ($tokentables as $sv)
     {
         modifyDatabase("","ALTER TABLE ".$sv." ADD [emailstatus] VARCHAR(300) DEFAULT 'OK'"); echo $modifyoutput; flush();ob_flush();
@@ -600,7 +600,7 @@ function upgrade_token_tables125()
 function upgrade_token_tables128()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like('tokens');
+    $tokentables = dbGetTablesLike('tokens');
     foreach ($tokentables as $sv)
     {
         modifyDatabase("","ALTER TABLE ".$sv." ADD [remindersent] VARCHAR(17) DEFAULT 'OK'"); echo $modifyoutput; flush();ob_flush();
@@ -627,7 +627,7 @@ function upgrade_survey_tables133a()
 function upgrade_token_tables134()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like("tokens%");
+    $tokentables = dbGetTablesLike("tokens%");
     foreach ($tokentables as $sv)
     {
         modifyDatabase("","ALTER TABLE ".$sv." ADD [validfrom] DATETIME"); echo $modifyoutput; flush();ob_flush();
@@ -639,7 +639,7 @@ function upgrade_token_tables134()
 function upgrade_token_tables145()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like("tokens%");
+    $tokentables = dbGetTablesLike("tokens%");
     foreach ($tokentables as $sv) {
             modifyDatabase("","ALTER TABLE ".$sv." ADD [usesleft] int NOT NULL DEFAULT '1'"); echo $modifyoutput; flush();ob_flush();
             modifyDatabase("","UPDATE ".$sv." SET usesleft=0 WHERE completed<>'N'"); echo $modifyoutput; flush();ob_flush();
@@ -687,7 +687,7 @@ function mssql_drop_constraint($fieldname, $tablename)
 function upgrade_survey_tables139()
 {
     global $modifyoutput;
-    $surveyidquery = db_get_tables_like("survey\_%");
+    $surveyidquery = dbGetTablesLike("survey\_%");
     if (empty($surveyidresult)) {return "Database Error";}
     else
     {
@@ -706,7 +706,7 @@ function upgrade_question_attributes142()
     foreach ($questionids as $questionid)
     {
         //Select all affected question attributes
-        $attributevalues=db_select_column("SELECT value from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid);
+        $attributevalues=dbSelectColumn("SELECT value from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid);
         modifyDatabase("","delete from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid); echo $modifyoutput; flush();ob_flush();
         $record['value']=implode(';',$attributevalues);
         $record['attribute']='exclude_all_other';
@@ -880,7 +880,7 @@ function upgrade_tables143()
 function upgrade_timing_tables146()
 {
     global $modifyoutput;
-    $aTimingTables = db_get_tables_like("%timings");
+    $aTimingTables = dbGetTablesLike("%timings");
     foreach ($aTimingTables as $sTable) {
         modifyDatabase("","EXEC sp_rename '{$sTable}.interviewTime','interviewtime'"); echo $modifyoutput; flush(); ob_flush();
     }
diff --git a/application/helpers/update/upgrade-mssqlnative_helper.php b/application/helpers/update/upgrade-mssqlnative_helper.php
index d802891dc71..3570a5d38bb 100644
--- a/application/helpers/update/upgrade-mssqlnative_helper.php
+++ b/application/helpers/update/upgrade-mssqlnative_helper.php
@@ -581,7 +581,7 @@ function upgrade_survey_tables117()
 function upgrade_survey_tables118()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like('tokens');
+    $tokentables = dbGetTablesLike('tokens');
     foreach ($tokentables as $sv)
     {
         modifyDatabase("","ALTER TABLE ".$sv." ALTER COLUMN [token] VARCHAR(36)"); echo $modifyoutput; flush();ob_flush();
@@ -592,7 +592,7 @@ function upgrade_survey_tables118()
 function upgrade_token_tables125()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like('tokens');
+    $tokentables = dbGetTablesLike('tokens');
     foreach ($tokentables as $sv)
     {
         modifyDatabase("","ALTER TABLE ".$sv." ADD [emailstatus] VARCHAR(300) DEFAULT 'OK'"); echo $modifyoutput; flush();ob_flush();
@@ -603,7 +603,7 @@ function upgrade_token_tables125()
 function upgrade_token_tables128()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like('tokens');
+    $tokentables = dbGetTablesLike('tokens');
     foreach ($tokentables as $sv)
     {
         modifyDatabase("","ALTER TABLE ".$sv." ADD [remindersent] VARCHAR(17) DEFAULT 'OK'"); echo $modifyoutput; flush();ob_flush();
@@ -630,7 +630,7 @@ function upgrade_survey_tables133a()
 function upgrade_token_tables134()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like('tokens');
+    $tokentables = dbGetTablesLike('tokens');
     foreach ($tokentables as $sv)
     {
         modifyDatabase("","ALTER TABLE ".$sv." ADD [validfrom] DATETIME"); echo $modifyoutput; flush();ob_flush();
@@ -642,7 +642,7 @@ function upgrade_token_tables134()
 function upgrade_token_tables145()
 {
     global $modifyoutput;
-    $tokentables = db_get_tables_like('tokens');
+    $tokentables = dbGetTablesLike('tokens');
     foreach ($tokentables as $sv) {
             modifyDatabase("","ALTER TABLE ".$sv." ADD [usesleft] int NOT NULL DEFAULT '1'"); echo $modifyoutput; flush();ob_flush();
             modifyDatabase("","UPDATE ".$sv." SET usesleft=0 WHERE completed<>'N'"); echo $modifyoutput; flush();ob_flush();
@@ -689,7 +689,7 @@ function mssql_drop_constraint($fieldname, $tablename)
 function upgrade_survey_tables139()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("survey\_%");
+    $surveyidresult = dbGetTablesLike("survey\_%");
     if (empty($surveyidresult)) {return "Database Error";}
     else
     {
@@ -708,7 +708,7 @@ function upgrade_question_attributes142()
     foreach ($questionids as $questionid)
     {
         //Select all affected question attributes
-        $attributevalues=db_select_column("SELECT value from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid);
+        $attributevalues=dbSelectColumn("SELECT value from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid);
         modifyDatabase("","delete from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid); echo $modifyoutput; flush();ob_flush();
         $record['value']=implode(';',$attributevalues);
         $record['attribute']='exclude_all_other';
@@ -882,7 +882,7 @@ function upgrade_tables143()
 function upgrade_timing_tables146()
 {
     global $modifyoutput;
-    $aTimingTables = db_get_tables_like("%timings");
+    $aTimingTables = dbGetTablesLike("%timings");
     foreach ($aTimingTables as $sTable) {
         modifyDatabase("","EXEC sp_rename '{$sTable}.interviewTime','interviewtime'"); echo $modifyoutput; flush(); ob_flush();
     }
diff --git a/application/helpers/update/upgrade-mysql_helper.php b/application/helpers/update/upgrade-mysql_helper.php
index 1113af4a039..4b5bd458527 100644
--- a/application/helpers/update/upgrade-mysql_helper.php
+++ b/application/helpers/update/upgrade-mysql_helper.php
@@ -693,7 +693,7 @@ function upgrade_survey_tables117()
 function upgrade_survey_tables118()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("tokens%");
+    $surveyidresult = dbGetTablesLike("tokens%");
     if (!$surveyidresult) {return "Database Error";}
     else
     {
@@ -707,7 +707,7 @@ function upgrade_survey_tables118()
 function upgrade_token_tables125()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("tokens%");
+    $surveyidresult = dbGetTablesLike("tokens%");
     if (!$surveyidresult) {return "Database Error";}
     else
     {
@@ -722,7 +722,7 @@ function upgrade_token_tables125()
 function upgrade_token_tables128()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("tokens%");
+    $surveyidresult = dbGetTablesLike("tokens%");
     if (!$surveyidresult) {return "Database Error";}
     else
     {
@@ -739,7 +739,7 @@ function upgrade_token_tables128()
 
 function upgrade_survey_tables133()
 {
-    $surveyidquery = "SELECT sid,additional_languages FROM ".db_quote_id('{{surveys}}');
+    $surveyidquery = "SELECT sid,additional_languages FROM ".dbQuoteID('{{surveys}}');
     $surveyidresult = Yii::app()->db->createCommand($surveyidquery)->queryAll();
     foreach ( $surveyidresult as $sv )
     {
@@ -752,7 +752,7 @@ function upgrade_survey_tables133()
 function upgrade_token_tables134()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("tokens%");
+    $surveyidresult = dbGetTablesLike("tokens%");
     if (!$surveyidresult) {return "Database Error";}
     else
     {
@@ -768,7 +768,7 @@ function upgrade_token_tables134()
 function upgrade_token_tables145()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("tokens%");
+    $surveyidresult = dbGetTablesLike("tokens%");
     if (!$surveyidresult) {return "Database Error";}
     else
     {
@@ -837,7 +837,7 @@ function upgrade_survey_tables139()
 {
     global $modifyoutput;
     $dbprefix = Yii::app()->db->tablePrefix;
-    $surveyidresult = db_get_tables_like("survey\_%");
+    $surveyidresult = dbGetTablesLike("survey\_%");
     if (empty($surveyidresult)) {return "Database Error";}
     else
     {
@@ -862,7 +862,7 @@ function upgrade_question_attributes142()
         foreach ($questionids as $questionid)
         {
             //Select all affected question attributes
-            $attributevalues=db_select_column("SELECT value from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid);
+            $attributevalues=dbSelectColumn("SELECT value from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid);
             modifyDatabase("","delete from {{question_attributes}} where attribute='exclude_all_other' and qid=".$questionid); echo $modifyoutput; flush();@ob_flush();
             $record['value']=implode(';',$attributevalues);
             $record['attribute']='exclude_all_other';
@@ -1033,7 +1033,7 @@ function upgrade_tables143()
 function upgrade_timing_tables146()
 {
     global $modifyoutput;
-    $aTimingTables = db_get_tables_like("%timings");
+    $aTimingTables = dbGetTablesLike("%timings");
     foreach ($aTimingTables as $sTable) {
         modifyDatabase("","ALTER TABLE {$sTable} CHANGE `interviewTime` `interviewtime` DOUBLE NULL default 0;"); echo $modifyoutput; flush();@ob_flush();
     }
diff --git a/application/helpers/update/upgrade-postgres_helper.php b/application/helpers/update/upgrade-postgres_helper.php
index c2cda596020..03676b40b16 100644
--- a/application/helpers/update/upgrade-postgres_helper.php
+++ b/application/helpers/update/upgrade-postgres_helper.php
@@ -401,7 +401,7 @@ function db_upgrade($oldversion) {
 function upgrade_token_tables128()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("tokens%");
+    $surveyidresult = dbGetTablesLike("tokens%");
     if (empty($surveyidresult)) {return "Database Error";}
     else
     {
@@ -417,7 +417,7 @@ function upgrade_survey_tables133()
 {
     global $modifyoutput;
 
-    $surveyidquery = "SELECT sid, additional_languages FROM ".db_quote_id('{{surveys}}');
+    $surveyidquery = "SELECT sid, additional_languages FROM ".dbQuoteID('{{surveys}}');
     $surveyidresult = Yii::app()->createCommand($surveyidquery)->queryAll();
     foreach ( $surveyidresult as $sv )
     {
@@ -428,7 +428,7 @@ function upgrade_survey_tables133()
 function upgrade_token_tables134()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("tokens%");
+    $surveyidresult = dbGetTablesLike("tokens%");
     if (empty($surveyidresult)) {return "Database Error";}
     else
     {
@@ -443,7 +443,7 @@ function upgrade_token_tables134()
 function upgrade_token_tables145()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("tokens%");
+    $surveyidresult = dbGetTablesLike("tokens%");
     if (empty($surveyidresult)) {return "Database Error";}
     else
     {
@@ -458,7 +458,7 @@ function upgrade_token_tables145()
 function upgrade_survey_tables139()
 {
     global $modifyoutput;
-    $surveyidresult = db_get_tables_like("survey\_%");
+    $surveyidresult = dbGetTablesLike("survey\_%");
     if (empty($surveyidresult)) {return "Database Error";}
     else
     {
@@ -644,7 +644,7 @@ function upgrade_tables143()
 function upgrade_timing_tables146()
 {
     global $modifyoutput;
-    $aTimingTables=db_get_tables_like("%timings");
+    $aTimingTables=dbGetTablesLike("%timings");
     foreach ($aTimingTables as $sTable) {
         modifyDatabase("","ALTER TABLE {$sTable} RENAME COLUMN \"interviewTime\" TO interviewtime;"); echo $modifyoutput; flush();ob_flush();
     }
diff --git a/application/libraries/Save.php b/application/libraries/Save.php
index 7f2330d960c..f1f127489ca 100644
--- a/application/libraries/Save.php
+++ b/application/libraries/Save.php
@@ -236,7 +236,7 @@ function savedsilent()
         submitanswer();
         // Prepare email
         $tokenentryquery = 'SELECT * from {{tokens_'.$surveyid.'}} WHERE token=\''.sanitize_paranoid_string($clienttoken).'\';';
-        $tokenentryresult = db_execute_assoc($tokenentryquery);
+        $tokenentryresult = dbExecuteAssoc($tokenentryquery);
         $tokenentryarray = $tokenentryresult->read();
 
         $from = $thissurvey['adminname'].' <'.$thissurvey['adminemail'].'>';
diff --git a/application/views/admin/browse/browseallrow_view.php b/application/views/admin/browse/browseallrow_view.php
index bc1cd7487a2..9ef886d8760 100644
--- a/application/views/admin/browse/browseallrow_view.php
+++ b/application/views/admin/browse/browseallrow_view.php
@@ -17,7 +17,7 @@
     </td>
     <?php
     $i = 0;
-    if ($surveyinfo['anonymized'] == "N" && $dtrow['token'] && db_tables_exist($tokentable))
+    if ($surveyinfo['anonymized'] == "N" && $dtrow['token'] && tableExists($tokentable))
     {
         if (isset($dtrow['tid']) && !empty($dtrow['tid']))
         {
diff --git a/application/views/admin/dataentry/content_view.php b/application/views/admin/dataentry/content_view.php
index 5a5136a1346..e4ed237e13c 100644
--- a/application/views/admin/dataentry/content_view.php
+++ b/application/views/admin/dataentry/content_view.php
@@ -78,7 +78,7 @@
                 {
                     // first scale
                     $delquery = "SELECT * FROM {{answers}} WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' and scale_id=0 ORDER BY sortorder, code";
-                    $delresult = db_execute_assoc($delquery); ?>
+                    $delresult = dbExecuteAssoc($delquery); ?>
                 <tr><td><?php echo $dearow['question']; ?></td><td>
                         <select name='<?php echo $fieldname.$dearow['title']; ?>#0'>
                             <option selected='selected' value=''><?php $clang->eT("Please choose..."); ?></option>
@@ -88,7 +88,7 @@
                                 <?php } ?>
                         </select></td>
                     <?php $delquery = "SELECT * FROM {{answers}} WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' and scale_id=1 ORDER BY sortorder, code";
-                        $delresult = db_execute_assoc($delquery); ?>
+                        $delresult = dbExecuteAssoc($delquery); ?>
                     <td>
                         <select name='<?php echo $fieldname.$dearow['title']; ?>#1'>
                             <option selected='selected' value=''><?php $clang->eT("Please choose..."); ?></option>
diff --git a/application/views/admin/expressions/test/navigation_test.php b/application/views/admin/expressions/test/navigation_test.php
index 93660ff6f67..4fb00ac2d78 100644
--- a/application/views/admin/expressions/test/navigation_test.php
+++ b/application/views/admin/expressions/test/navigation_test.php
@@ -5,7 +5,7 @@
     $query = "select a.surveyls_survey_id as sid, a.surveyls_title as title, b.datecreated, b.assessments "
     . "from {{surveys_languagesettings}} as a join {{surveys}} as b on a.surveyls_survey_id = b.sid"
     . " where a.surveyls_language='en' order by a.surveyls_title, b.datecreated";
-    $data = db_execute_assoc($query);
+    $data = dbExecuteAssoc($query);
     $surveyList='';
     foreach($data->readAll() as $row) {
         $surveyList .= "<option value='" . $row['sid'] .'|' . $row['assessments'] . "'>#" . $row['sid'] . " [" . $row['datecreated'] . '] ' . flattenText($row['title']) . "</option>\n";
diff --git a/application/views/admin/expressions/test/survey_logic_file.php b/application/views/admin/expressions/test/survey_logic_file.php
index d043fbce5cd..dfb4adccdba 100644
--- a/application/views/admin/expressions/test/survey_logic_file.php
+++ b/application/views/admin/expressions/test/survey_logic_file.php
@@ -16,7 +16,7 @@
     $query = "select a.surveyls_survey_id as sid, a.surveyls_title as title, b.datecreated, b.assessments "
     . "from {{surveys_languagesettings}} as a join {{surveys}} as b on a.surveyls_survey_id = b.sid"
     . " where a.surveyls_language='en' order by a.surveyls_title, b.datecreated";
-    $data = db_execute_assoc($query);
+    $data = dbExecuteAssoc($query);
     $surveyList='';
     foreach($data->readAll() as $row) {
         $surveyList .= "<option value='" . $row['sid'] .'|' . $row['assessments'] . "'>#" . $row['sid'] . " [" . $row['datecreated'] . '] ' . flattenText($row['title']) . "</option>\n";
diff --git a/application/views/admin/survey/Question/answerOptions_view.php b/application/views/admin/survey/Question/answerOptions_view.php
index 48f99de04d9..5fbc4fc5032 100644
--- a/application/views/admin/survey/Question/answerOptions_view.php
+++ b/application/views/admin/survey/Question/answerOptions_view.php
@@ -77,7 +77,7 @@
                 <?php $alternate=true;
 
                 $query = "SELECT * FROM {{answers}} WHERE qid='{$qid}' AND language='{$anslang}' and scale_id=$scale_id ORDER BY sortorder, code";
-                $result = db_execute_assoc($query);
+                $result = dbExecuteAssoc($query);
                 $anscount = $result->count();
 
                 foreach ($result->readAll() as $row)
diff --git a/application/views/admin/survey/subview/tabNotification_view.php b/application/views/admin/survey/subview/tabNotification_view.php
index 3128f598dbe..19cbd1a75e8 100644
--- a/application/views/admin/survey/subview/tabNotification_view.php
+++ b/application/views/admin/survey/subview/tabNotification_view.php
@@ -149,11 +149,11 @@
                     ><?php $clang->eT("No"); ?></option>
             </select></li>
 
-        <li><label for='googleanalyticsapikey'><?php $clang->eT("Google Analytics API Key for this Survey?"); ?></label>
+        <li><label for='googleanalyticsapikey'><?php $clang->eT("Google Analytics API key for this survey?"); ?></label>
             <input type='text' value='<?php echo $esrow['googleanalyticsapikey']; ?>' name='googleanalyticsapikey' id='googleanalyticsapikey' size='20'/>
         </li>
 
-        <li><label for='googleanalyticsstyle'><?php $clang->eT("Google Analytics Style for this Survey?"); ?></label>
+        <li><label for='googleanalyticsstyle'><?php $clang->eT("Google Analytics style for this survey?"); ?></label>
             <select id='googleanalyticsstyle' name='googleanalyticsstyle'>
                 <option value='0'
                     <?php if (!$esrow['googleanalyticsstyle'] || $esrow['googleanalyticsstyle'] == "0") { ?>
@@ -169,7 +169,7 @@
                     <?php if ($esrow['googleanalyticsstyle'] == "2") { ?>
                         selected='selected'
                         <?php } ?>
-                    ><?php $clang->eT("SurveyName-[SID]/GroupName"); ?></option>
+                    ><?php $clang->eT("Survey name-[SID]/Group name"); ?></option>
             </select></li>
 
     </ul></div>
\ No newline at end of file
diff --git a/application/views/admin/user/editusers.php b/application/views/admin/user/editusers.php
index f5307542f53..2d3288e913d 100644
--- a/application/views/admin/user/editusers.php
+++ b/application/views/admin/user/editusers.php
@@ -104,7 +104,7 @@
                 <td align='center'><?php echo $noofsurveyslist[$i];?></td>
 
                 <?php $uquery = "SELECT users_name FROM {{users}} WHERE uid=".$usr['parent_id'];
-                    $uresult = db_execute_assoc($uquery); //Checked
+                    $uresult = dbExecuteAssoc($uquery); //Checked
                     $userlist = array();
                     $srow = $uresult->read();
 
diff --git a/application/views/admin/user/setuserrights.php b/application/views/admin/user/setuserrights.php
index 0f59f579af8..9c1a96f7957 100644
--- a/application/views/admin/user/setuserrights.php
+++ b/application/views/admin/user/setuserrights.php
@@ -13,12 +13,12 @@
 foreach ($userlist as $usr) {
     if ($usr['uid'] == $postuserid) {
         $squery = "SELECT create_survey, configurator, create_user, delete_user, superadmin, participant_panel,manage_template, manage_label FROM {{users}} WHERE uid=".Yii::app()->session['loginID'];	//		added by Dennis
-        $sresult = db_select_limit_assoc($squery); //Checked
+        $sresult = dbSelectLimitAssoc($squery); //Checked
         $parent = $sresult->read();
 
         // Initial SuperAdmin has parent_id == 0
         $adminquery = "SELECT uid FROM {{users}} WHERE parent_id=0";
-        $adminresult = db_select_limit_assoc($adminquery, 1);
+        $adminresult = dbSelectLimitAssoc($adminquery, 1);
         $row=$adminresult->read();
 		?>