diff --git a/addressbook/inc/class.contacts_ldap_wip.inc.php b/addressbook/inc/class.contacts_ldap_wip.inc.php
index 92c949a6f6..e57d6ac982 100644
--- a/addressbook/inc/class.contacts_ldap_wip.inc.php
+++ b/addressbook/inc/class.contacts_ldap_wip.inc.php
@@ -65,16 +65,16 @@
 				'fn'                  => 'cn',        // 'prefix given middle family suffix'
 				'n_given'             => 'givenname',   // firstname
 				'n_family'            => 'sn',  // lastname
-				'n_middle'            => 'phpgwMiddlename',
-				'n_prefix'            => 'phpgwPrefix',
-				'n_suffix'            => 'phpgwSuffix',
-				'sound'               => 'phpgwAudio',
-				'bday'                => 'phpgwBirthday',
+				'n_middle'            => 'phpgwmiddlename',
+				'n_prefix'            => 'phpgwprefix',
+				'n_suffix'            => 'phpgwsuffix',
+				'sound'               => 'phpgwaudio',
+				'bday'                => 'phpgwbirthday',
 				'note'                => 'description',
-				'tz'                  => 'phpgwTz',
-				'geo'                 => 'phpgwGeo',
-				'url'                 => 'phpgwUrl',
-				'pubkey'              => 'phpgwPublicKey',
+				'tz'                  => 'phpgwtz',
+				'geo'                 => 'phpgwgeo',
+				'url'                 => 'phpgwurl',
+				'pubkey'              => 'phpgwpublickey',
 
 				'org_name'            => 'o',  // company
 				'org_unit'            => 'ou',  // division
@@ -85,33 +85,33 @@
 				'adr_one_region'      => 'st', 
 				'adr_one_postalcode'  => 'postalcode',
 				'adr_one_countryname' => 'countryname',
-				'adr_one_type'        => 'phpgwAdrOneType', // address is domestic/intl/postal/parcel/work/home
-				'label'               => 'phpgwAddressLabel', // address label
+				'adr_one_type'        => 'phpgwadronetype', // address is domestic/intl/postal/parcel/work/home
+				'label'               => 'phpgwaddresslabel', // address label
 
-				'adr_two_street'      => 'phpgwAdrTwoStreet',
-				'adr_two_locality'    => 'phpgwAdrTwoLocality', 
-				'adr_two_region'      => 'phpgwAdrTwoRegion', 
-				'adr_two_postalcode'  => 'phpgwAdrTwoPostalCode',
-				'adr_two_countryname' => 'phpgwAdrTwoCountryName',
-				'adr_two_type'        => 'phpgwAdrTwoType', // address is domestic/intl/postal/parcel/work/home
+				'adr_two_street'      => 'phpgwadrtwostreet',
+				'adr_two_locality'    => 'phpgwadrtwolocality', 
+				'adr_two_region'      => 'phpgwadrtworegion', 
+				'adr_two_postalcode'  => 'phpgwadrtwopostalcode',
+				'adr_two_countryname' => 'phpgwadrtwocountryname',
+				'adr_two_type'        => 'phpgwadrtwotype', // address is domestic/intl/postal/parcel/work/home
 
 				'tel_work'            => 'telephonenumber',
 				'tel_home'            => 'homephone',
-				'tel_voice'           => 'phpgwVoiceTelephoneNumber',
+				'tel_voice'           => 'phpgwvoicetelephonenumber',
 				'tel_fax'             => 'facsimiletelephonenumber', 
-				'tel_msg'             => 'phpgwMsgTelephoneNumber',
-				'tel_cell'            => 'phpgwCellTelephoneNumber',
-				'tel_pager'           => 'phpgwPagerTelephoneNumber',
-				'tel_bbs'             => 'phpgwBbsTelephoneNumber',
-				'tel_modem'           => 'phpgwModemTelephoneNumber',
-				'tel_car'             => 'phpgwMobileTelephoneNumber',
-				'tel_isdn'            => 'phpgwIsdnphoneNumber',
-				'tel_video'           => 'phpgwVideophoneNumber',
-				'tel_prefer'          => 'phpgwPreferPhone', // home, work, voice, etc
+				'tel_msg'             => 'phpgwmsgtelephonenumber',
+				'tel_cell'            => 'phpgwcelltelephonenumber',
+				'tel_pager'           => 'phpgwpagertelephonenumber',
+				'tel_bbs'             => 'phpgwbbstelephonenumber',
+				'tel_modem'           => 'phpgwmodemtelephonenumber',
+				'tel_car'             => 'phpgwmobiletelephonenumber',
+				'tel_isdn'            => 'phpgwisdnphonenumber',
+				'tel_video'           => 'phpgwvideophonenumber',
+				'tel_prefer'          => 'phpgwpreferphone', // home, work, voice, etc
 				'email'               => 'mail',
-				'email_type'          => 'phpgwMailType', //'INTERNET','CompuServe',etc...
-				'email_home'          => 'phpgwMailHome',
-				'email_home_type'     => 'phpgwMailHomeType' //'INTERNET','CompuServe',etc...
+				'email_type'          => 'phpgwmailtype', //'INTERNET','CompuServe',etc...
+				'email_home'          => 'phpgwmailhome',
+				'email_home_type'     => 'phpgwmailhometype' //'INTERNET','CompuServe',etc...
 			);
 
 			$this->non_contact_fields = array(