Rename to DefaultRecipient.

There are only two hard things in Computer Science: cache invalidation
and naming things.

8 files changed, 187 insertions, 187 deletions

diff --git a/DefaultTo.sopm b/DefaultRecipient.sopm
index 1cad73b..166ec8f 100644
--- a/DefaultTo.sopm
+++ b/DefaultRecipient.sopm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <otrs_package version="1.0">
-  <Name>DefaultTo</Name>
+  <Name>DefaultRecipient</Name>
   <Version>1.0.0</Version>
   <Framework>4.0.x</Framework>
   <Vendor>spline.de</Vendor>
@@ -11,16 +11,16 @@
   <BuildDate>?</BuildDate>
   <BuildHost>?</BuildHost>
   <Filelist>
-    <File Permission="644" Location="Kernel/Config/Files/DefaultTo.xml"/>
-    <File Permission="644" Location="Kernel/Modules/AdminDefaultTo.pm"/>
-    <File Permission="644" Location="Kernel/Modules/AdminDefaultToTemplates.pm"/>
-    <File Permission="644" Location="Kernel/Output/HTML/DefaultTo.pm"/>
-    <File Permission="644" Location="Kernel/Output/HTML/Standard/AdminDefaultTo.tt"/>
-    <File Permission="644" Location="Kernel/Output/HTML/Standard/AdminDefaultToTemplates.tt"/>
-    <File Permission="644" Location="Kernel/System/DefaultTo.pm"/>
+    <File Permission="644" Location="Kernel/Config/Files/DefaultRecipient.xml"/>
+    <File Permission="644" Location="Kernel/Modules/AdminDefaultRecipient.pm"/>
+    <File Permission="644" Location="Kernel/Modules/AdminDefaultRecipientTemplates.pm"/>
+    <File Permission="644" Location="Kernel/Output/HTML/DefaultRecipient.pm"/>
+    <File Permission="644" Location="Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt"/>
+    <File Permission="644" Location="Kernel/Output/HTML/Standard/AdminDefaultRecipientTemplates.tt"/>
+    <File Permission="644" Location="Kernel/System/DefaultRecipient.pm"/>
   </Filelist>
   <DatabaseInstall>
-    <TableCreate Name="default_to">
+    <TableCreate Name="default_recipient">
       <Column Name="id" Required="true" PrimaryKey="true" AutoIncrement="true" Type="BIGINT"/>
       <Column Name="title" Required="true" Size="250" Type="VARCHAR"/>
       <Column Name="remove_default" Required="true" Type="SMALLINT"/>
@@ -31,29 +31,29 @@
       <Column Name="create_by" Required="true" Type="INTEGER"/>
       <Column Name="change_time" Required="true" Type="DATE"/>
       <Column Name="change_by" Required="true" Type="INTEGER"/>
-      <Index Name="default_to_title">
+      <Index Name="default_recipient_title">
         <IndexColumn Name="title"/>
       </Index>
-      <Unique Name="default_to_unique_title">
+      <Unique Name="default_recipient_unique_title">
         <UniqueColumn Name="title"/>
       </Unique>
     </TableCreate>
-    <TableCreate Name="default_to_response">
+    <TableCreate Name="default_recipient_response">
       <Column Name="id" Required="true" PrimaryKey="true" AutoIncrement="true" Type="BIGINT"/>
-      <Column Name="default_to_id" Required="true" Type="BIGINT"/>
+      <Column Name="default_recipient_id" Required="true" Type="BIGINT"/>
       <Column Name="template_id" Required="true" Type="BIGINT"/>
-      <Index Name="default_to_template_default_to_id">
-        <IndexColumn Name="default_to_id"/>
+      <Index Name="default_recipient_template_default_recipient_id">
+        <IndexColumn Name="default_recipient_id"/>
       </Index>
-      <Index Name="default_to_template_template_id">
+      <Index Name="default_recipient_template_template_id">
         <IndexColumn Name="template_id"/>
       </Index>
-      <Unique Name="default_to_template_map">
-        <UniqueColumn Name="default_to_id"/>
+      <Unique Name="default_recipient_template_map">
+        <UniqueColumn Name="default_recipient_id"/>
         <UniqueColumn Name="template_id"/>
       </Unique>
-      <ForeignKey ForeignTable="default_to">
-        <Reference Local="default_to_id" Foreign="id"/>
+      <ForeignKey ForeignTable="default_recipient">
+        <Reference Local="default_recipient_id" Foreign="id"/>
       </ForeignKey>
       <ForeignKey ForeignTable="standard_template">
         <Reference Local="template_id" Foreign="id"/>
@@ -61,7 +61,7 @@
     </TableCreate>
   </DatabaseInstall>
   <DatabaseUninstall>
-    <TableDrop Name="default_to_response"/>
-    <TableDrop Name="default_to"/>
+    <TableDrop Name="default_recipient_response"/>
+    <TableDrop Name="default_recipient"/>
   </DatabaseUninstall>
 </otrs_package>
diff --git a/Kernel/Config/Files/DefaultTo.xml b/Kernel/Config/Files/DefaultRecipient.xml
index 2a075a5..de680e1 100644
--- a/Kernel/Config/Files/DefaultTo.xml
+++ b/Kernel/Config/Files/DefaultRecipient.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <otrs_config version="1.0" init="Config">
-    <ConfigItem Name="Frontend::Output::FilterElementPre###DefaultTo" Required="0" Valid="1">
+    <ConfigItem Name="Frontend::Output::FilterElementPre###DefaultRecipient" Required="0" Valid="1">
         <Description Translatable="1">Change the default To address, based on the response template.</Description>
         <Group>Ticket</Group>
         <SubGroup>Frontend::Agent::Ticket::ViewCompose</SubGroup>
         <Setting>
             <Hash>
-                <Item Key="Module">Kernel::Output::HTML::DefaultTo</Item>
+                <Item Key="Module">Kernel::Output::HTML::DefaultRecipient</Item>
                 <Item Key="Templates">
                     <Hash>
                         <Item Key="AgentTicketCompose">1</Item>
@@ -15,7 +15,7 @@
             </Hash>
         </Setting>
     </ConfigItem>
-    <ConfigItem Name="Frontend::Module###AdminDefaultTo" Required="0" Valid="1">
+    <ConfigItem Name="Frontend::Module###AdminDefaultRecipient" Required="0" Valid="1">
         <Description Translatable="1">Frontend module registration for the agent interface.</Description>
         <Group>Ticket</Group>
         <SubGroup>Frontend::Admin::ModuleRegistration</SubGroup>
@@ -23,19 +23,19 @@
             <FrontendModuleReg>
                 <Group>admin</Group>
                 <Description>Admin</Description>
-                <Title Translatable="1">DefaultTo</Title>
+                <Title Translatable="1">DefaultRecipient</Title>
                 <NavBarName>Admin</NavBarName>
                 <NavBarModule>
                     <Module>Kernel::Output::HTML::NavBarModuleAdmin</Module>
-                    <Name Translatable="1">DefaultTo</Name>
-                    <Description Translatable="1">Create and manage DefaultTo entries.</Description>
+                    <Name Translatable="1">DefaultRecipient</Name>
+                    <Description Translatable="1">Create and manage DefaultRecipients.</Description>
                     <Block>Queue</Block>
                     <Prio>300</Prio>
                 </NavBarModule>
             </FrontendModuleReg>
         </Setting>
     </ConfigItem>
-    <ConfigItem Name="Frontend::Module###AdminDefaultToTemplates" Required="0" Valid="1">
+    <ConfigItem Name="Frontend::Module###AdminDefaultRecipientTemplates" Required="0" Valid="1">
         <Description Translatable="1">Frontend module registration for the agent interface.</Description>
         <Group>Ticket</Group>
         <SubGroup>Frontend::Admin::ModuleRegistration</SubGroup>
@@ -43,12 +43,12 @@
             <FrontendModuleReg>
                 <Group>admin</Group>
                 <Description>Admin</Description>
-                <Title Translatable="1">Templates &lt;-&gt; DefaultTo</Title>
+                <Title Translatable="1">Templates &lt;-&gt; DefaultRecipient</Title>
                 <NavBarName>Admin</NavBarName>
                 <NavBarModule>
                     <Module>Kernel::Output::HTML::NavBarModuleAdmin</Module>
-                    <Name Translatable="1">Templates &lt;-&gt; DefaultTo</Name>
-                    <Description Translatable="1">Link templates to DefaultTo.</Description>
+                    <Name Translatable="1">Templates &lt;-&gt; DefaultRecipient</Name>
+                    <Description Translatable="1">Link templates to DefaultRecipients.</Description>
                     <Block>Queue</Block>
                     <Prio>300</Prio>
                 </NavBarModule>
diff --git a/Kernel/Modules/AdminDefaultTo.pm b/Kernel/Modules/AdminDefaultRecipient.pm
index e6951e8..29097b3 100644
--- a/Kernel/Modules/AdminDefaultTo.pm
+++ b/Kernel/Modules/AdminDefaultRecipient.pm
@@ -1,5 +1,5 @@
 # --
-# Kernel/Modules/AdminDefaultTo.pm - provides admin DefaultTo module
+# Kernel/Modules/AdminDefaultRecipient.pm - provides admin DefaultRecipient module
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -7,7 +7,7 @@
 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
 # --
 
-package Kernel::Modules::AdminDefaultTo;
+package Kernel::Modules::AdminDefaultRecipient;
 
 use strict;
 use warnings;
@@ -17,7 +17,7 @@ our @ObjectDependencies = qw(
     Kernel::Output::HTML::Layout
     Kernel::System::DB
     Kernel::System::Web::Request
-    Kernel::System::DefaultTo
+    Kernel::System::DefaultRecipient
 );
 
 sub new {
@@ -45,8 +45,8 @@ sub Run {
     # ------------------------------------------------------------ #
     if ( $Self->{Subaction} eq 'Change' ) {
         my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' ) || '';
-        my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
-        my %Data = $DefaultToObject->Get(
+        my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
+        my %Data = $DefaultRecipientObject->Get(
             ID => $ID,
         );
 
@@ -57,7 +57,7 @@ sub Run {
             %Data,
         );
         $Output .= $Self->{LayoutObject}->Output(
-            TemplateFile => 'AdminDefaultTo',
+            TemplateFile => 'AdminDefaultRecipient',
             Data         => \%Param,
         );
         $Output .= $Self->{LayoutObject}->Footer();
@@ -71,7 +71,7 @@ sub Run {
         # challenge token check for write action
         $Self->{LayoutObject}->ChallengeTokenCheck();
 
-        my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
+        my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
         my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' );
         my ( %GetParam, %Errors );
         for my $Parameter (qw(ID Title RemoveDefault AddNew NewAddress
@@ -84,8 +84,8 @@ sub Run {
         # check needed data
         $Errors{TitleInvalid} = 'ServerError' if !$GetParam{Title};
 
-        # check if a DefaultTo entry exist with this title
-        my $TitleExists = $DefaultToObject->TitleExistsCheck(
+        # check if a DefaultRecipient entry exist with this title
+        my $TitleExists = $DefaultRecipientObject->TitleExistsCheck(
             Title => $GetParam{Title},
             ID    => $GetParam{ID}
         );
@@ -98,7 +98,7 @@ sub Run {
         # if no errors occurred
         if ( !%Errors ) {
 
-            if ( $DefaultToObject->Update(
+            if ( $DefaultRecipientObject->Update(
                      %GetParam,
                      UserID => $Self->{UserID},
                  )
@@ -109,7 +109,7 @@ sub Run {
                 $Output .= $Self->{LayoutObject}->NavigationBar();
                 $Output .= $Self->{LayoutObject}->Notify( Info => 'Template updated!' );
                 $Output .= $Self->{LayoutObject}->Output(
-                    TemplateFile => 'AdminDefaultTo',
+                    TemplateFile => 'AdminDefaultRecipient',
                     Data         => \%Param,
                 );
                 $Output .= $Self->{LayoutObject}->Footer();
@@ -127,7 +127,7 @@ sub Run {
             %GetParam,
         );
         $Output .= $Self->{LayoutObject}->Output(
-            TemplateFile => 'AdminDefaultTo',
+            TemplateFile => 'AdminDefaultRecipient',
             Data         => \%Param,
         );
         $Output .= $Self->{LayoutObject}->Footer();
@@ -147,7 +147,7 @@ sub Run {
             Title => $Title,
         );
         $Output .= $Self->{LayoutObject}->Output(
-            TemplateFile => 'AdminDefaultTo',
+            TemplateFile => 'AdminDefaultRecipient',
             Data         => \%Param,
         );
         $Output .= $Self->{LayoutObject}->Footer();
@@ -161,7 +161,7 @@ sub Run {
         # challenge token check for write action
         $Self->{LayoutObject}->ChallengeTokenCheck();
 
-        my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
+        my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
         my @NewIDs = $Self->{ParamObject}->GetArray( Param => 'IDs' );
         my ( %GetParam, %Errors );
 
@@ -173,8 +173,8 @@ sub Run {
         # check needed data
         $Errors{TitleInvalid} = 'ServerError' if !$GetParam{Title};
         
-        # check if a DefaultTo entry exists with this title
-        my $TitleExists = $DefaultToObject->TitleExistsCheck( Title => $GetParam{Title} );
+        # check if a DefaultRecipient entry exists with this title
+        my $TitleExists = $DefaultRecipientObject->TitleExistsCheck( Title => $GetParam{Title} );
         if ($TitleExists) {
             $Errors{TitleExists} = 1;
             $Errors{TitleInvalid} = 'ServerError';
@@ -183,8 +183,8 @@ sub Run {
         # if no errors occurred
         if ( !%Errors ) {
 
-            # add DefaultTo entry
-            my $ID = $DefaultToObject->Add(
+            # add DefaultRecipient entry
+            my $ID = $DefaultRecipientObject->Add(
                 %GetParam,
                 UserID => $Self->{UserID},
             );
@@ -195,7 +195,7 @@ sub Run {
                 $Output .= $Self->{LayoutObject}->NavigationBar();
                 $Output .= $Self->{LayoutObject}->Notify( Info => 'Template added!' );
                 $Output .= $Self->{LayoutObject}->Output(
-                    TemplateFile => 'AdminDefaultTo',
+                    TemplateFile => 'AdminDefaultRecipient',
                     Data         => \%Param,
                 );
                 $Output .= $Self->{LayoutObject}->Footer();
@@ -213,7 +213,7 @@ sub Run {
             %GetParam,
         );
         $Output .= $Self->{LayoutObject}->Output(
-            TemplateFile => 'AdminDefaultTo',
+            TemplateFile => 'AdminDefaultRecipient',
             Data         => \%Param,
         );
         $Output .= $Self->{LayoutObject}->Footer();
@@ -227,10 +227,10 @@ sub Run {
         # challenge token check for write action
         $Self->{LayoutObject}->ChallengeTokenCheck();
 
-        my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
+        my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
         my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' );
 
-        my $Delete = $DefaultToObject->Delete(
+        my $Delete = $DefaultRecipientObject->Delete(
             ID => $ID,
         );
         if ( !$Delete ) {
@@ -248,7 +248,7 @@ sub Run {
         my $Output = $Self->{LayoutObject}->Header();
         $Output .= $Self->{LayoutObject}->NavigationBar();
         $Output .= $Self->{LayoutObject}->Output(
-            TemplateFile => 'AdminDefaultTo',
+            TemplateFile => 'AdminDefaultRecipient',
             Data         => \%Param,
         );
         $Output .= $Self->{LayoutObject}->Footer();
@@ -268,21 +268,21 @@ sub _Edit {
     $Self->{LayoutObject}->Block( Name => 'ActionList' );
     $Self->{LayoutObject}->Block( Name => 'ActionOverview' );
 
-    $Param{DefaultToTitleString} = '';
+    $Param{DefaultRecipientTitleString} = '';
 
-    $Param{DefaultToRemoveDefaultOption} = $Self->{LayoutObject}->BuildSelection(
+    $Param{DefaultRecipientRemoveDefaultOption} = $Self->{LayoutObject}->BuildSelection(
         Data       => $Self->{ConfigObject}->Get('YesNoOptions'),
         Name       => 'RemoveDefault',
         SelectedID => $Param{RemoveDefault} || 0,
     );
 
-    $Param{DefaultToAddNewOption} = $Self->{LayoutObject}->BuildSelection(
+    $Param{DefaultRecipientAddNewOption} = $Self->{LayoutObject}->BuildSelection(
         Data       => $Self->{ConfigObject}->Get('YesNoOptions'),
         Name       => 'AddNew',
         SelectedID => $Param{AddNew} || 0,
     );
 
-    $Param{DefaultToNewAddressString} = '';
+    $Param{DefaultRecipientNewAddressString} = '';
 
     $Self->{LayoutObject}->Block(
         Name => 'OverviewUpdate',
@@ -328,19 +328,19 @@ sub _Overview {
         Data => \%Param,
     );
 
-    my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
-    my %List = $DefaultToObject->List();
+    my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
+    my %List = $DefaultRecipientObject->List();
 
     for my $ID ( sort { $List{$a} cmp $List{$b} } keys %List )
     {
-        my %DefaultTo = $DefaultToObject->Get(
+        my %DefaultRecipient = $DefaultRecipientObject->Get(
             ID => $ID,
         );
 
         $Self->{LayoutObject}->Block(
             Name => 'OverviewResultRow',
             Data => {
-                %DefaultTo,
+                %DefaultRecipient,
             },
         );
     }
diff --git a/Kernel/Modules/AdminDefaultToTemplates.pm b/Kernel/Modules/AdminDefaultRecipientTemplates.pm
index af49b00..b83f30f 100644
--- a/Kernel/Modules/AdminDefaultToTemplates.pm
+++ b/Kernel/Modules/AdminDefaultRecipientTemplates.pm
@@ -1,5 +1,5 @@
 # --
-# Kernel/Modules/AdminDefaultToTemplates.pm - to manage DefaultTo <-> templates assignments
+# Kernel/Modules/AdminDefaultRecipientTemplates.pm - to manage DefaultRecipient <-> templates assignments
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -7,7 +7,7 @@
 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
 # --
 
-package Kernel::Modules::AdminDefaultToTemplates;
+package Kernel::Modules::AdminDefaultRecipientTemplates;
 
 use strict;
 use warnings;
@@ -15,7 +15,7 @@ use warnings;
 our @ObjectDependencies = qw(
     Kernel::Output::HTML::Layout
     Kernel::System::DB
-    Kernel::System::DefaultTo
+    Kernel::System::DefaultRecipient
     Kernel::System::StandardTemplate
     Kernel::System::Web::Request
 );
@@ -41,7 +41,7 @@ sub Run {
     my ( $Self, %Param ) = @_;
 
     # ------------------------------------------------------------ #
-    # template <-> DefaultTo 1:n
+    # template <-> DefaultRecipient 1:n
     # ------------------------------------------------------------ #
     if ( $Self->{Subaction} eq 'Template' ) {
 
@@ -54,17 +54,17 @@ sub Run {
         );
         my $Name = $StandardTemplateType . ' - ' . $StandardTemplateData{Name};
 
-        # get DefaultTo data
-        my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
-        my %DefaultToData = $DefaultToObject->List();
-        my %Member = $DefaultToObject->MappingList(
+        # get DefaultRecipient data
+        my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
+        my %DefaultRecipientData = $DefaultRecipientObject->List();
+        my %Member = $DefaultRecipientObject->MappingList(
             TemplateID => $ID,
         );
 
         my $Output = $Self->{LayoutObject}->Header();
         $Output .= $Self->{LayoutObject}->NavigationBar();
         $Output .= $Self->_Change(
-            Data    => \%DefaultToData,
+            Data    => \%DefaultRecipientData,
             ID      => $ID,
             Name    => $Name,
             Mapping => \%Member,
@@ -75,13 +75,13 @@ sub Run {
     }
 
     # ------------------------------------------------------------ #
-    # templates <-> DefaultTo n:1
+    # templates <-> DefaultRecipient n:1
     # ------------------------------------------------------------ #
-    elsif ( $Self->{Subaction} eq 'DefaultTo' ) {
+    elsif ( $Self->{Subaction} eq 'DefaultRecipient' ) {
 
         my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' );
-        my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
-        my %DefaultToData = $DefaultToObject->Get( ID => $ID );
+        my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
+        my %DefaultRecipientData = $DefaultRecipientObject->Get( ID => $ID );
 
         # get templates
         my $StandardTemplateObject = $Kernel::OM->Get('Kernel::System::StandardTemplate');
@@ -102,8 +102,8 @@ sub Run {
         }
 
         # get assigned templates
-        my %Member = $DefaultToObject->MappingList(
-            DefaultToID => $ID,
+        my %Member = $DefaultRecipientObject->MappingList(
+            DefaultRecipientID => $ID,
         );
 
         my $Output = $Self->{LayoutObject}->Header();
@@ -111,27 +111,27 @@ sub Run {
         $Output .= $Self->_Change(
             Data    => \%StandardTemplateData,
             ID      => $ID,
-            Name    => $DefaultToData{Title},
+            Name    => $DefaultRecipientData{Title},
             Mapping => \%Member,
-            Type    => 'DefaultTo',
+            Type    => 'DefaultRecipient',
         );
         $Output .= $Self->{LayoutObject}->Footer();
         return $Output;
     }
 
     # ------------------------------------------------------------ #
-    # add templates to DefaultTo
+    # add templates to DefaultRecipient
     # ------------------------------------------------------------ #
-    elsif ( $Self->{Subaction} eq 'ChangeDefaultTo' ) {
+    elsif ( $Self->{Subaction} eq 'ChangeDefaultRecipient' ) {
 
         # challenge token check for write action
         $Self->{LayoutObject}->ChallengeTokenCheck();
 
         # get current mapping
         my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' );
-        my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
-        my %Mapping = $DefaultToObject->MappingList(
-            DefaultToID => $ID,
+        my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
+        my %Mapping = $DefaultRecipientObject->MappingList(
+            DefaultRecipientID => $ID,
         );
 
         # get new templates
@@ -145,15 +145,15 @@ sub Run {
         for my $TemplateID (@TemplatesAll) {
             if ( $TemplatesSelected{$TemplateID} ) {
                 if ( ! $Mapping{$TemplateID} ) {
-                    $DefaultToObject->MappingAdd(
+                    $DefaultRecipientObject->MappingAdd(
                         TemplateID => $TemplateID,
-                        DefaultToID => $ID,
+                        DefaultRecipientID => $ID,
                     );
                 }
             }
             else {
                 if ( $Mapping{$TemplateID} ) {
-                    $DefaultToObject->MappingDelete(
+                    $DefaultRecipientObject->MappingDelete(
                         ID => $Mapping{$TemplateID},
                     );
                 }
@@ -173,8 +173,8 @@ sub Run {
 
         # get current mapping
         my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' );
-        my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
-        my %Mapping = $DefaultToObject->MappingList(
+        my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
+        my %Mapping = $DefaultRecipientObject->MappingList(
             TemplateID => $ID,
         );
 
@@ -186,19 +186,19 @@ sub Run {
         my %Selected = map { $_ => 1 } @Selected;
 
         # check all used queues
-        for my $DefaultToID (@All) {
-            if ( $Selected{$DefaultToID} ) {
-                if ( ! $Mapping{$DefaultToID} ) {
-                    $DefaultToObject->MappingAdd(
+        for my $DefaultRecipientID (@All) {
+            if ( $Selected{$DefaultRecipientID} ) {
+                if ( ! $Mapping{$DefaultRecipientID} ) {
+                    $DefaultRecipientObject->MappingAdd(
                         TemplateID => $ID,
-                        DefaultToID => $DefaultToID,
+                        DefaultRecipientID => $DefaultRecipientID,
                     );
                 }
             }
             else {
-                if ( $Mapping{$DefaultToID} ) {
-                    $DefaultToObject->MappingDelete(
-                        ID => $Mapping{$DefaultToID},
+                if ( $Mapping{$DefaultRecipientID} ) {
+                    $DefaultRecipientObject->MappingDelete(
+                        ID => $Mapping{$DefaultRecipientID},
                     );
                 }
             }
@@ -223,8 +223,8 @@ sub _Change {
     my %Data    = %{ $Param{Data} };
     my %Mapping = %{ $Param{Mapping} };
     my $Type    = $Param{Type} || 'Template';
-    my $NeType  = 'DefaultTo';
-    $NeType     = 'Template' if $Type eq 'DefaultTo';
+    my $NeType  = 'DefaultRecipient';
+    $NeType     = 'Template' if $Type eq 'DefaultRecipient';
 
     $Self->{LayoutObject}->Block( Name => 'Overview' );
     $Self->{LayoutObject}->Block( Name => 'ActionList' );
@@ -260,7 +260,7 @@ sub _Change {
     }
 
     return $Self->{LayoutObject}->Output(
-        TemplateFile => 'AdminDefaultToTemplates',
+        TemplateFile => 'AdminDefaultRecipientTemplates',
         Data         => \%Param,
     );
 }
@@ -276,7 +276,7 @@ sub _Overview {
     # no actions in action list
     #    $Self->{LayoutObject}->Block(Name=>'ActionList');
     $Self->{LayoutObject}->Block( Name => 'FilterTemplate' );
-    $Self->{LayoutObject}->Block( Name => 'FilterDefaultTo' );
+    $Self->{LayoutObject}->Block( Name => 'FilterDefaultRecipient' );
     $Self->{LayoutObject}->Block( Name => 'OverviewResult' );
 
     # get std template list
@@ -323,14 +323,14 @@ sub _Overview {
     }
 
     # get queue data
-    my $DefaultToObject = $Kernel::OM->Get('Kernel::System::DefaultTo');
-    my %DefaultToData = $DefaultToObject->List();
+    my $DefaultRecipientObject = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
+    my %DefaultRecipientData = $DefaultRecipientObject->List();
 
     # if there are results to show
-    if (%DefaultToData) {
+    if (%DefaultRecipientData) {
         for my $ID (
-            sort { uc( $DefaultToData{$a} ) cmp uc( $DefaultToData{$b} ) }
-            keys %DefaultToData
+            sort { uc( $DefaultRecipientData{$a} ) cmp uc( $DefaultRecipientData{$b} ) }
+            keys %DefaultRecipientData
             )
         {
 
@@ -338,8 +338,8 @@ sub _Overview {
             $Self->{LayoutObject}->Block(
                 Name => 'Listn1',
                 Data => {
-                    Name      => $DefaultToData{$ID},
-                    Subaction => 'DefaultTo',
+                    Name      => $DefaultRecipientData{$ID},
+                    Subaction => 'DefaultRecipient',
                     ID        => $ID,
                 },
             );
@@ -349,14 +349,14 @@ sub _Overview {
     # otherwise it displays a no data found message
     else {
         $Self->{LayoutObject}->Block(
-            Name => 'NoDefaultToFoundMsg',
+            Name => 'NoDefaultRecipientFoundMsg',
             Data => {},
         );
     }
 
     # return output
     return $Self->{LayoutObject}->Output(
-        TemplateFile => 'AdminDefaultToTemplates',
+        TemplateFile => 'AdminDefaultRecipientTemplates',
         Data         => \%Param,
     );
 }
diff --git a/Kernel/Output/HTML/DefaultTo.pm b/Kernel/Output/HTML/DefaultRecipient.pm
index 1d09b40..5d94c4a 100644
--- a/Kernel/Output/HTML/DefaultTo.pm
+++ b/Kernel/Output/HTML/DefaultRecipient.pm
@@ -1,16 +1,16 @@
 # --
-# Kernel/Output/HTML/DefaultTo.pm
+# Kernel/Output/HTML/DefaultRecipient.pm
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 
-package Kernel::Output::HTML::DefaultTo;
+package Kernel::Output::HTML::DefaultRecipient;
 
 use strict;
 use warnings;
 
 our @ObjectDependencies = qw(
     Kernel::System::Log
-    Kernel::System::DefaultTo
+    Kernel::System::DefaultRecipient
 );
 
 sub new {
@@ -20,7 +20,7 @@ sub new {
     my $Self = {};
     $Self->{LayoutObject} = $Param{LayoutObject} || die "Got no LayoutObject!";
     $Self->{LogObject} = $Kernel::OM->Get('Kernel::System::Log');
-    $Self->{DefaultToObject} = $Kernel::OM->Get('Kernel::System::DefaultTo');
+    $Self->{DefaultRecipientObject} = $Kernel::OM->Get('Kernel::System::DefaultRecipient');
     bless( $Self, $Type );
 
     return $Self;
@@ -30,7 +30,7 @@ sub Run {
     my ( $Self, %Param ) = @_;
     return if !$Self->{LayoutObject};
 
-    for (qw(LogObject LayoutObject DefaultToObject)) {
+    for (qw(LogObject LayoutObject DefaultRecipientObject)) {
         return if !$Self->{$_};
     }
 
@@ -58,21 +58,21 @@ sub Run {
     # return if not generated from template
     return unless $Ticket->{TemplateID};
 
-    # get all DefaultTo
-    my %MappedDefaultTo = $Self->{DefaultToObject}->MappingList(
+    # get all DefaultRecipient
+    my %MappedDefaultRecipient = $Self->{DefaultRecipientObject}->MappingList(
         TemplateID => $Ticket->{TemplateID},
     );
 
     my $RemoveDefault = 0;
     my @Addresses = ();
-    foreach my $ID ( values %MappedDefaultTo ) {
-        my %DefaultTo = $Self->{DefaultToObject}->Get(
+    foreach my $ID ( values %MappedDefaultRecipient ) {
+        my %DefaultRecipient = $Self->{DefaultRecipientObject}->Get(
             ID => $ID,
         );
 
-        $RemoveDefault = 1 if $DefaultTo{RemoveDefault};
-        if ( $DefaultTo{AddNew} ) {
-            push @Addresses, $DefaultTo{NewAddress};
+        $RemoveDefault = 1 if $DefaultRecipient{RemoveDefault};
+        if ( $DefaultRecipient{AddNew} ) {
+            push @Addresses, $DefaultRecipient{NewAddress};
         }
     }
 
diff --git a/Kernel/Output/HTML/Standard/AdminDefaultTo.tt b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt
index 2c1744d..613a243 100644
--- a/Kernel/Output/HTML/Standard/AdminDefaultTo.tt
+++ b/Kernel/Output/HTML/Standard/AdminDefaultRecipient.tt
@@ -1,5 +1,5 @@
 # --
-# AdminDefaultTo.tt - provides HTML form for AdminDefaultTo
+# AdminDefaultRecipient.tt - provides HTML form for AdminDefaultRecipient
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -9,7 +9,7 @@
 
 [% RenderBlockStart("Overview") %]
 <div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst">
-    <h1>[% Translate("Manage DefaultTo") | html %]</h1>
+    <h1>[% Translate("Manage DefaultRecipient") | html %]</h1>
 
     <div class="SidebarColumn">
 [% RenderBlockStart("ActionList") %]
@@ -24,7 +24,7 @@
 [% RenderBlockEnd("ActionOverview") %]
 [% RenderBlockStart("ActionAdd") %]
                     <li>
-                        <a href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=Add" class="CallForAction Fullsize Center"><span><i class="fa fa-plus-square"></i>[% Translate("Add DefaultTo") | html %]</span></a>
+                        <a href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=Add" class="CallForAction Fullsize Center"><span><i class="fa fa-plus-square"></i>[% Translate("Add DefaultRecipient") | html %]</span></a>
                     </li>
 [% RenderBlockEnd("ActionAdd") %]
                 </ul>
@@ -49,11 +49,11 @@
             <div class="Content">
 
                 <p class="FieldExplanation">
-                    [% Translate("With DefaultTo you could change or extend the default To address in a ticket response dependent on the used template.") | html %]
+                    [% Translate("With DefaultRecipient you could change or extend the default To address in a ticket response dependent on the used template.") | html %]
                 </p>
                 <p>
                     [% Translate("Attention") | html %]:
-                    <a href="[% Env("Baselink") %]Action=AdminDefaultToTemplates">[% Translate("Don't forget to add new DefaultTo entries to templates.") | html %]</a>
+                    <a href="[% Env("Baselink") %]Action=AdminDefaultRecipientTemplates">[% Translate("Don't forget to add new DefaultRecipients to templates.") | html %]</a>
                 </p>
             </div>
         </div>
@@ -66,7 +66,7 @@
                 <h2>[% Translate("List") | html %]</h2>
             </div>
             <div class="Content">
-                <table class="DataTable" id="DefaultTo">
+                <table class="DataTable" id="DefaultRecipient">
                     <thead>
                         <tr>
                             <th>[% Translate("Title") | html %]</th>
@@ -115,7 +115,7 @@
         </div>
 [% WRAPPER JSOnDocumentComplete %]
 <script type="text/javascript">//<![CDATA[
-    Core.UI.Table.InitTableFilter($('#Filter'), $('#DefaultTo'));
+    Core.UI.Table.InitTableFilter($('#Filter'), $('#DefaultRecipient'));
 //]]></script>
 [% END %]
 [% RenderBlockEnd("OverviewResult") %]
@@ -124,10 +124,10 @@
         <div class="WidgetSimple">
             <div class="Header">
 [% RenderBlockStart("HeaderAdd") %]
-                <h2>[% Translate("Add DefaultTo") | html %]</h2>
+                <h2>[% Translate("Add DefaultRecipient") | html %]</h2>
 [% RenderBlockEnd("HeaderAdd") %]
 [% RenderBlockStart("HeaderEdit") %]
-                <h2>[% Translate("Edit DefaultTo") | html %]</h2>
+                <h2>[% Translate("Edit DefaultRecipient") | html %]</h2>
 [% RenderBlockEnd("HeaderEdit") %]
             </div>
             <div class="Content">
@@ -147,7 +147,7 @@
                                 <p>[% Translate("This field is required.") | html %]</p>
 [% RenderBlockEnd("TitleServerError") %]
 [% RenderBlockStart("ExistTitleServerError") %]
-                                <p>[% Translate("A DefaultTo entry with this title already exists!") | html %]</p>
+                                <p>[% Translate("A DefaultRecipient entry with this title already exists!") | html %]</p>
 [% RenderBlockEnd("TitleServerError") %]
                             </div>
                         </div>
@@ -155,13 +155,13 @@
 
                         <label for="RemoveDefault">[% Translate("Remove default") | html %]:</label>
                         <div class="Field">
-                            [% Data.DefaultToRemoveDefaultOption %]
+                            [% Data.DefaultRecipientRemoveDefaultOption %]
                         </div>
                         <div class="Clear"></div>
 
                         <label for="AddNew">[% Translate("Add new") | html %]:</label>
                         <div class="Field">
-                            [% Data.DefaultToAddNewOption %]
+                            [% Data.DefaultRecipientAddNewOption %]
                         </div>
                         <div class="Clear"></div>
 
@@ -180,7 +180,7 @@
                         <div class="Field">
                             <button class="Primary CallForAction" type="submit" value="[% Translate("Submit") | html %]"><span>[% Translate("Submit") | html %]</span></button>
                             [% Translate("or") | html %]
-                            <a href="[% Env("Baselink") %]Action=AdminDefaultTo">[% Translate("Cancel") | html %]</a>
+                            <a href="[% Env("Baselink") %]Action=AdminDefaultRecipient">[% Translate("Cancel") | html %]</a>
                         </div>
                         <div class="Clear"></div>
                     </fieldset>
diff --git a/Kernel/Output/HTML/Standard/AdminDefaultToTemplates.tt b/Kernel/Output/HTML/Standard/AdminDefaultRecipientTemplates.tt
index e3436f7..a3fd402 100644
--- a/Kernel/Output/HTML/Standard/AdminDefaultToTemplates.tt
+++ b/Kernel/Output/HTML/Standard/AdminDefaultRecipientTemplates.tt
@@ -1,5 +1,5 @@
 # --
-# AdminDefaultToTemplates.tt - provides HTML form for AdminInterface
+# AdminDefaultRecipientTemplates.tt - provides HTML form for AdminInterface
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -9,7 +9,7 @@
 
 [% RenderBlockStart("Overview") %]
 <div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst">
-    <h1>[% Translate("Manage Template-DefaultTo Relations") | html %]</h1>
+    <h1>[% Translate("Manage Template-DefaultRecipient Relations") | html %]</h1>
 
     <div class="SidebarColumn">
 
@@ -51,16 +51,16 @@
             </div>
         </div>
 [% RenderBlockEnd("FilterTemplate") %]
-[% RenderBlockStart("FilterDefaultTo") %]
+[% RenderBlockStart("FilterDefaultRecipient") %]
         <div class="WidgetSimple">
             <div class="Header">
-                <h2><label for="FilterDefaultTo">[% Translate("Filter for DefaultTo") | html %]</label></h2>
+                <h2><label for="FilterDefaultRecipient">[% Translate("Filter for DefaultRecipient") | html %]</label></h2>
             </div>
             <div class="Content">
-                <input type="text" id="FilterDefaultTo" class="FilterBox" placeholder="[% Translate("Just start typing to filter...") | html %]" name="FilterDefaultTo" value="" title="[% Translate("Filter for DefaultTo") | html %]" />
+                <input type="text" id="FilterDefaultRecipient" class="FilterBox" placeholder="[% Translate("Just start typing to filter...") | html %]" name="FilterDefaultRecipient" value="" title="[% Translate("Filter for DefaultRecipient") | html %]" />
             </div>
         </div>
-[% RenderBlockEnd("FilterDefaultTo") %]
+[% RenderBlockEnd("FilterDefaultRecipient") %]
 
     </div>
 
@@ -85,12 +85,12 @@
                     </ul>
                 </div>
                 <div class="Size1of2">
-                    <ul class="Tablelike" id="DefaultTo">
-                        <li class="Header">[% Translate("DefaultTo") | html %]</li>
+                    <ul class="Tablelike" id="DefaultRecipient">
+                        <li class="Header">[% Translate("DefaultRecipient") | html %]</li>
                         <li class="FilterMessage Hidden">[% Translate("No matches found.") | html %]</li>
-[% RenderBlockStart("NoDefaultToFoundMsg") %]
+[% RenderBlockStart("NoDefaultRecipientFoundMsg") %]
                         <li>[% Translate("No data found.") | html %]</li>
-[% RenderBlockEnd("NoDefaultToFoundMsg") %]
+[% RenderBlockEnd("NoDefaultRecipientFoundMsg") %]
 [% RenderBlockStart("Listn1") %]
                         <li><a href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=[% Data.Subaction | uri %];ID=[% Data.ID | uri %]" class="AsBlock">[% Data.Name | html %]</a></li>
 [% RenderBlockEnd("Listn1") %]
@@ -102,18 +102,18 @@
 [% WRAPPER JSOnDocumentComplete %]
 <script type="text/javascript">//<![CDATA[
     Core.UI.Table.InitTableFilter($('#FilterTemplates'), $('#Templates'));
-    Core.UI.Table.InitTableFilter($('#FilterDefaultTo'), $('#DefaultTo'));
+    Core.UI.Table.InitTableFilter($('#FilterDefaultRecipient'), $('#DefaultRecipient'));
 //]]></script>
 [% END %]
 [% RenderBlockEnd("OverviewResult") %]
 [% RenderBlockStart("Change") %]
             <div class="Header">
                 <h2>
-[% RenderBlockStart("ChangeHeaderDefaultTo") %]
-                    [% Translate("Change DefaultTo Relations for Template") | html %]
-[% RenderBlockEnd("ChangeHeaderDefaultTo") %]
+[% RenderBlockStart("ChangeHeaderDefaultRecipient") %]
+                    [% Translate("Change DefaultRecipient Relations for Template") | html %]
+[% RenderBlockEnd("ChangeHeaderDefaultRecipient") %]
 [% RenderBlockStart("ChangeHeaderTemplate") %]
-                    [% Translate("Change Template Relations for DefaultTo") | html %]
+                    [% Translate("Change Template Relations for DefaultRecipient") | html %]
 [% RenderBlockEnd("ChangeHeaderTemplate") %]
                     <a href="[% Env("Baselink") %]Action=[% Data.ActionHome | uri %];Subaction=Change;ID=[% Data.ID | uri %]">[% Data.Name | html %]</a>
                 </h2>
diff --git a/Kernel/System/DefaultTo.pm b/Kernel/System/DefaultRecipient.pm
index 9e8acdb..d9b72d6 100644
--- a/Kernel/System/DefaultTo.pm
+++ b/Kernel/System/DefaultRecipient.pm
@@ -1,5 +1,5 @@
 # --
-# Kernel/System/DefaultTo.pm - core module
+# Kernel/System/DefaultRecipient.pm - core module
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -7,7 +7,7 @@
 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
 # --
 
-package Kernel::System::DefaultTo;
+package Kernel::System::DefaultRecipient;
 
 use strict;
 use warnings;
@@ -44,9 +44,9 @@ sub Add {
 
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
-    # insert new DefaultTo
+    # insert new DefaultRecipient
     return if !$DBObject->Do(
-        SQL => 'INSERT INTO default_to '
+        SQL => 'INSERT INTO default_recipient '
              . '(title, remove_default, add_new, new_address, comments, '
              . ' create_time, create_by, change_time, change_by) '
              . 'VALUES (?, ?, ?, ?, ?, current_timestamp, ?, current_timestamp, ?)',
@@ -63,7 +63,7 @@ sub Add {
 
     # get new id
     return if !$DBObject->Prepare(
-        SQL   => 'SELECT MAX(id) FROM default_to WHERE title = ?',
+        SQL   => 'SELECT MAX(id) FROM default_recipient WHERE title = ?',
         Bind  => [ \$Param{Title}, ],
         Limit => 1,
     );
@@ -77,7 +77,7 @@ sub Add {
     my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
     $LogObject->Log(
         Priority => 'notice',
-        Message  => "DefaultTo '$ID' created successfully!",
+        Message  => "DefaultRecipient '$ID' created successfully!",
     );
 
     return $ID;
@@ -101,9 +101,9 @@ sub Update {
 
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
-    # insert new DefaultTo
+    # insert new DefaultRecipient
     return if !$DBObject->Do(
-        SQL => 'UPDATE default_to SET title = ?, remove_default = ?, '
+        SQL => 'UPDATE default_recipient SET title = ?, remove_default = ?, '
              . 'add_new = ?, new_address = ?, comments = ?, change_by = ?, '
              . 'change_time = current_timestamp '
              . 'WHERE id = ?',
@@ -140,14 +140,14 @@ sub Get {
     return if !$DBObject->Prepare(
         SQL => 'SELECT id, title, remove_default, add_new, new_address, '
              . 'comments, create_time, create_by, change_time, change_by '
-             . 'FROM default_to WHERE id = ?',
+             . 'FROM default_recipient WHERE id = ?',
         Bind  => [ \$Param{ID} ],
         Limit => 1,
     );
 
-    my %DefaultTo;
+    my %DefaultRecipient;
     while ( my @Data = $DBObject->FetchrowArray() ) {
-        %DefaultTo = (
+        %DefaultRecipient = (
             ID            => $Data[0],
             Title         => $Data[1],
             RemoveDefault => $Data[2],
@@ -161,7 +161,7 @@ sub Get {
         );
     }
 
-    return %DefaultTo;
+    return %DefaultRecipient;
 }
 
 sub Delete {
@@ -181,14 +181,14 @@ sub Delete {
 
     # delete mapping
     return if !$DBObject->Do(
-        SQL => 'DELETE FROM default_to_response '
-             . 'WHERE default_to_id = ?',
+        SQL => 'DELETE FROM default_recipient_response '
+             . 'WHERE default_recipient_id = ?',
         Bind => [ \$Param{ID} ],
     );
 
     # delete entry
     return $DBObject->Do(
-        SQL => 'DELETE FROM default_to WHERE id = ?',
+        SQL => 'DELETE FROM default_recipient WHERE id = ?',
         Bind  => [ \$Param{ID} ],
     );
 }
@@ -198,15 +198,15 @@ sub List {
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
     $DBObject->Prepare(
-        SQL => 'SELECT id, title FROM default_to',
+        SQL => 'SELECT id, title FROM default_recipient',
     );
 
-    my %DefaultTo;
+    my %DefaultRecipient;
     while ( my @Data = $DBObject->FetchrowArray() ) {
-        $DefaultTo{ $Data[0] } = $Data[1];
+        $DefaultRecipient{ $Data[0] } = $Data[1];
     }
 
-    return %DefaultTo;
+    return %DefaultRecipient;
 }
 
 sub TitleExistsCheck {
@@ -214,7 +214,7 @@ sub TitleExistsCheck {
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
     return if !$DBObject->Prepare(
-        SQL  => 'SELECT id FROM default_to WHERE title = ?',
+        SQL  => 'SELECT id FROM default_recipient WHERE title = ?',
         Bind => [ \$Param{Title} ],
     );
 
@@ -235,7 +235,7 @@ sub MappingAdd {
     my ( $Self, %Param ) = @_;
 
     # check needed stuff
-    for my $Needed (qw(TemplateID DefaultToID)) {
+    for my $Needed (qw(TemplateID DefaultRecipientID)) {
         if ( !$Param{$Needed} ) {
             my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
             $LogObject->Log(
@@ -250,21 +250,21 @@ sub MappingAdd {
 
     # insert new mapping
     return if !$DBObject->Do(
-        SQL => 'INSERT INTO default_to_response '
-             . '(template_id, default_to_id) VALUES (?, ?)',
+        SQL => 'INSERT INTO default_recipient_response '
+             . '(template_id, default_recipient_id) VALUES (?, ?)',
         Bind => [
             \$Param{TemplateID},
-            \$Param{DefaultToID},
+            \$Param{DefaultRecipientID},
         ],
     );
 
     # get new id
     return if !$DBObject->Prepare(
-        SQL   => 'SELECT MAX(id) FROM default_to_response '
-               . 'WHERE template_id = ? AND default_to_id = ?',
+        SQL   => 'SELECT MAX(id) FROM default_recipient_response '
+               . 'WHERE template_id = ? AND default_recipient_id = ?',
         Bind  => [
             \$Param{TemplateID},
-            \$Param{DefaultToID}, ],
+            \$Param{DefaultRecipientID}, ],
         Limit => 1,
     );
 
@@ -277,7 +277,7 @@ sub MappingAdd {
     my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
     $LogObject->Log(
         Priority => 'notice',
-        Message  => "DefaultTo mapping '$ID' "
+        Message  => "DefaultRecipient mapping '$ID' "
                   . "created successfully!",
     );
 
@@ -301,7 +301,7 @@ sub MappingDelete {
 
     # delete mapping
     return $DBObject->Do(
-        SQL => 'DELETE FROM default_to_response '
+        SQL => 'DELETE FROM default_recipient_response '
              . 'WHERE id = ?',
         Bind => [ \$Param{ID} ],
     );
@@ -311,11 +311,11 @@ sub MappingList {
     my ( $Self, %Param ) = @_;
 
      # check needed stuff
-    if ( !$Param{TemplateID} && !$Param{DefaultToID} ) {
+    if ( !$Param{TemplateID} && !$Param{DefaultRecipientID} ) {
         my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
         $LogObject->Log(
             Priority => 'error',
-            Message  => 'Got no TemplateID or DefaultToID!'
+            Message  => 'Got no TemplateID or DefaultRecipientID!'
         );
         return;
     }
@@ -325,8 +325,8 @@ sub MappingList {
     # find mapped objects
     if ( $Param{TemplateID} ) {
         $DBObject->Prepare(
-            SQL => 'SELECT id, default_to_id '
-                 . 'FROM default_to_response '
+            SQL => 'SELECT id, default_recipient_id '
+                 . 'FROM default_recipient_response '
                  . 'WHERE template_id = ?',
             Bind => [ \$Param{TemplateID}, ],
         );
@@ -334,9 +334,9 @@ sub MappingList {
     else {
         $DBObject->Prepare(
             SQL => 'SELECT id, template_id '
-                 . 'FROM default_to_response '
-                 . 'WHERE default_to_id = ?',
-            Bind => [ \$Param{DefaultToID}, ],
+                 . 'FROM default_recipient_response '
+                 . 'WHERE default_recipient_id = ?',
+            Bind => [ \$Param{DefaultRecipientID}, ],
         );
     }