Rename ResponseChangeDefaultTo to DefaultTo

7 files changed, 186 insertions, 195 deletions

diff --git a/DefaultTo.sopm b/DefaultTo.sopm
new file mode 100644
index 0000000..64f0282
--- /dev/null
+++ b/DefaultTo.sopm
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<otrs_package version="1.0">
+  <Name>DefaultTo</Name>
+  <Version>1.0.0</Version>
+  <Framework>4.0.x</Framework>
+  <Vendor>spline.de</Vendor>
+  <URL>http://www.spline.de/</URL>
+  <License>GNU AFFERO GENERAL PUBLIC LICENSE Version 3, November 2007</License>
+  <Description Lang="en"></Description>
+  <Description Lang="de"></Description>
+  <BuildDate>?</BuildDate>
+  <BuildHost>?</BuildHost>
+  <Filelist>
+    <File Permission="644" Location="Kernel/Config/Files/DefaultTo.xml"/>
+    <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/AdminDefaultToTemplates.tt"/>
+    <File Permission="644" Location="Kernel/System/DefaultTo.pm"/>
+  </Filelist>
+  <DatabaseInstall>
+    <TableCreate Name="default_to">
+      <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"/>
+      <Column Name="add_new" Required="true" Type="SMALLINT"/>
+      <Column Name="new_address" Required="false" Size="255" Type="VARCHAR"/>
+      <Index Name="default_to_title">
+        <IndexColumn Name="title"/>
+      </Index>
+      <Unique Name="default_to_unique_title">
+        <UniqueColumn Name="title"/>
+      </Unique>
+    </TableCreate>
+    <TableCreate Name="default_to_response">
+      <Column Name="id" Required="true" PrimaryKey="true" AutoIncrement="true" Type="BIGINT"/>
+      <Column Name="default_to_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>
+      <Index Name="default_to_template_template_id">
+        <IndexColumn Name="template_id"/>
+      </Index>
+      <Unique Name="default_to_template_map">
+        <UniqueColumn Name="default_to_id"/>
+        <UniqueColumn Name="template_id"/>
+      </Unique>
+      <ForeignKey ForeignTable="default_to">
+        <Reference Local="default_to_id" Foreign="id"/>
+      </ForeignKey>
+      <ForeignKey ForeignTable="standard_template">
+        <Reference Local="template_id" Foreign="id"/>
+      </ForeignKey>
+    </TableCreate>
+  </DatabaseInstall>
+  <DatabaseUninstall>
+    <TableDrop Name="default_to_response"/>
+    <TableDrop Name="default_to"/>
+  </DatabaseUninstall>
+</otrs_package>
diff --git a/Kernel/Config/Files/ResponseChangeDefaultTo.xml b/Kernel/Config/Files/DefaultTo.xml
index 0c19c0f..9dd0f64 100644
--- a/Kernel/Config/Files/ResponseChangeDefaultTo.xml
+++ b/Kernel/Config/Files/DefaultTo.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <otrs_config version="1.0" init="Config">
-    <ConfigItem Name="Frontend::Output::FilterElementPre###ResponseChangeDefaultTo" Required="0" Valid="1">
+    <ConfigItem Name="Frontend::Output::FilterElementPre###DefaultTo" 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::ResponseChangeDefaultTo</Item>
+                <Item Key="Module">Kernel::Output::HTML::DefaultTo</Item>
                 <Item Key="Templates">
                     <Hash>
                         <Item Key="AgentTicketCompose">1</Item>
@@ -15,7 +15,7 @@
             </Hash>
         </Setting>
     </ConfigItem>
-    <ConfigItem Name="Frontend::Module###AdminResponseChangeDefaultToTemplates" Required="0" Valid="1">
+    <ConfigItem Name="Frontend::Module###AdminDefaultToTemplates" Required="0" Valid="1">
         <Description Translatable="1">Frontend module registration for the agent interface.</Description>
         <Group>Ticket</Group>
         <SubGroup>Frontend::Admin::ModuleRegistration</SubGroup>
@@ -23,12 +23,12 @@
             <FrontendModuleReg>
                 <Group>admin</Group>
                 <Description>Admin</Description>
-                <Title Translatable="1">Templates &lt;-&gt; ResponseChangeDefaultTo</Title>
+                <Title Translatable="1">Templates &lt;-&gt; DefaultTo</Title>
                 <NavBarName>Admin</NavBarName>
                 <NavBarModule>
                     <Module>Kernel::Output::HTML::NavBarModuleAdmin</Module>
-                    <Name Translatable="1">Templates &lt;-&gt; ResponseChangeDefaultTo</Name>
-                    <Description Translatable="1">Link templates to ResponseChangeDefaultTo.</Description>
+                    <Name Translatable="1">Templates &lt;-&gt; DefaultTo</Name>
+                    <Description Translatable="1">Link templates to DefaultTo.</Description>
                     <Block>Queue</Block>
                     <Prio>300</Prio>
                 </NavBarModule>
diff --git a/Kernel/Modules/AdminResponseChangeDefaultToTemplates.pm b/Kernel/Modules/AdminDefaultToTemplates.pm
index 02a0b36..12c5826 100644
--- a/Kernel/Modules/AdminResponseChangeDefaultToTemplates.pm
+++ b/Kernel/Modules/AdminDefaultToTemplates.pm
@@ -1,5 +1,5 @@
 # --
-# Kernel/Modules/AdminResponseChangeDefaultToTemplates.pm - to manage ResponseChangeDefaultTo <-> templates assignments
+# Kernel/Modules/AdminDefaultToTemplates.pm - to manage DefaultTo <-> templates assignments
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
@@ -7,12 +7,12 @@
 # did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
 # --
 
-package Kernel::Modules::AdminResponseChangeDefaultToTemplates;
+package Kernel::Modules::AdminDefaultToTemplates;
 
 use strict;
 use warnings;
 
-use Kernel::System::ResponseChangeDefaultTo;
+use Kernel::System::DefaultTo;
 use Kernel::System::StandardTemplate;
 
 sub new {
@@ -29,8 +29,7 @@ sub new {
         }
     }
 
-    $Self->{ResponseChangeDefaultToObject} =
-        Kernel::System::ResponseChangeDefaultTo->new(%Param);
+    $Self->{DefaultToObject} = Kernel::System::DefaultTo->new(%Param);
     $Self->{StandardTemplateObject} =
         Kernel::System::StandardTemplate->new(%Param);
 
@@ -41,7 +40,7 @@ sub Run {
     my ( $Self, %Param ) = @_;
 
     # ------------------------------------------------------------ #
-    # template <-> ResponseChangeDefaultTo 1:n
+    # template <-> DefaultTo 1:n
     # ------------------------------------------------------------ #
     if ( $Self->{Subaction} eq 'Template' ) {
 
@@ -53,18 +52,16 @@ sub Run {
         );
         my $Name = $StandardTemplateType . ' - ' . $StandardTemplateData{Name};
 
-        # get ResponseChangeDefaultTo data
-        my %ResponseChangeDefaultToData =
-            $Self->{ResponseChangeDefaultToObject}->List();
-
-        my %Member = $Self->{ResponseChangeDefaultToObject}->MappingList(
-            ResponseID => $ID,
+        # get DefaultTo data
+        my %DefaultToData = $Self->{DefaultToObject}->List();
+        my %Member = $Self->{DefaultToObject}->MappingList(
+            TemplateID => $ID,
         );
 
         my $Output = $Self->{LayoutObject}->Header();
         $Output .= $Self->{LayoutObject}->NavigationBar();
         $Output .= $Self->_Change(
-            Data    => \%ResponseChangeDefaultToData,
+            Data    => \%DefaultToData,
             ID      => $ID,
             Name    => $Name,
             Mapping => \%Member,
@@ -75,13 +72,12 @@ sub Run {
     }
 
     # ------------------------------------------------------------ #
-    # templates <-> ResponseChangeDefaultTo n:1
+    # templates <-> DefaultTo n:1
     # ------------------------------------------------------------ #
-    elsif ( $Self->{Subaction} eq 'ResponseChangeDefaultTo' ) {
+    elsif ( $Self->{Subaction} eq 'DefaultTo' ) {
 
         my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' );
-        my %ResponseChangeDefaultToData =
-            $Self->{ResponseChangeDefaultToObject}->Get( ID => $ID );
+        my %DefaultToData = $Self->{DefaultToObject}->Get( ID => $ID );
 
         # get templates
         my %StandardTemplateData = $Self->{StandardTemplateObject}->StandardTemplateList(
@@ -101,8 +97,8 @@ sub Run {
         }
 
         # get assigned templates
-        my %Member = $Self->{ResponseChangeDefaultToObject}->MappingList(
-            ResponseChangeDefaultToID => $ID,
+        my %Member = $Self->{DefaultToObject}->MappingList(
+            DefaultToID => $ID,
         );
 
         my $Output = $Self->{LayoutObject}->Header();
@@ -110,26 +106,26 @@ sub Run {
         $Output .= $Self->_Change(
             Data    => \%StandardTemplateData,
             ID      => $ID,
-            Name    => $ResponseChangeDefaultToData{Title},
+            Name    => $DefaultToData{Title},
             Mapping => \%Member,
-            Type    => 'ResponseChangeDefaultTo',
+            Type    => 'DefaultTo',
         );
         $Output .= $Self->{LayoutObject}->Footer();
         return $Output;
     }
 
     # ------------------------------------------------------------ #
-    # add templates to ResponseChangeDefaultTo
+    # add templates to DefaultTo
     # ------------------------------------------------------------ #
-    elsif ( $Self->{Subaction} eq 'ChangeResponseChangeDefaultTo' ) {
+    elsif ( $Self->{Subaction} eq 'ChangeDefaultTo' ) {
 
         # challenge token check for write action
         $Self->{LayoutObject}->ChallengeTokenCheck();
 
         # get current mapping
         my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' );
-        my %Mapping = $Self->{ResponseChangeDefaultToObject}->MappingList(
-            ResponseChangeDefaultToID => $ID,
+        my %Mapping = $Self->{DefaultToObject}->MappingList(
+            DefaultToID => $ID,
         );
 
         # get new templates
@@ -143,15 +139,15 @@ sub Run {
         for my $TemplateID (@TemplatesAll) {
             if ( $TemplatesSelected{$TemplateID} ) {
                 if ( ! $Mapping{$TemplateID} ) {
-                    $Self->{ResponseChangeDefaultToObject}->MappingAdd(
-                        ResponseID => $TemplateID,
-                        ResponseChangeDefaultToID => $ID,
+                    $Self->{DefaultToObject}->MappingAdd(
+                        TemplateID => $TemplateID,
+                        DefaultToID => $ID,
                     );
                 }
             }
             else {
                 if ( $Mapping{$TemplateID} ) {
-                    $Self->{ResponseChangeDefaultToObject}->MappingDelete(
+                    $Self->{DefaultToObject}->MappingDelete(
                         ID => $Mapping{$TemplateID},
                     );
                 }
@@ -171,8 +167,8 @@ sub Run {
 
         # get current mapping
         my $ID = $Self->{ParamObject}->GetParam( Param => 'ID' );
-        my %Mapping = $Self->{ResponseChangeDefaultToObject}->MappingList(
-            ResponseID => $ID,
+        my %Mapping = $Self->{DefaultToObject}->MappingList(
+            TemplateID => $ID,
         );
 
         # get new queues
@@ -186,15 +182,15 @@ sub Run {
         for my $DefaultToID (@All) {
             if ( $Selected{$DefaultToID} ) {
                 if ( ! $Mapping{$DefaultToID} ) {
-                    $Self->{ResponseChangeDefaultToObject}->MappingAdd(
-                        ResponseID => $ID,
-                        ResponseChangeDefaultToID => $DefaultToID,
+                    $Self->{DefaultToObject}->MappingAdd(
+                        TemplateID => $ID,
+                        DefaultToID => $DefaultToID,
                     );
                 }
             }
             else {
                 if ( $Mapping{$DefaultToID} ) {
-                    $Self->{ResponseChangeDefaultToObject}->MappingDelete(
+                    $Self->{DefaultToObject}->MappingDelete(
                         ID => $Mapping{$DefaultToID},
                     );
                 }
@@ -220,8 +216,8 @@ sub _Change {
     my %Data    = %{ $Param{Data} };
     my %Mapping = %{ $Param{Mapping} };
     my $Type    = $Param{Type} || 'Template';
-    my $NeType  = 'ResponseChangeDefaultTo';
-    $NeType     = 'Template' if $Type eq 'ResponseChangeDefaultTo';
+    my $NeType  = 'DefaultTo';
+    $NeType     = 'Template' if $Type eq 'DefaultTo';
 
     $Self->{LayoutObject}->Block( Name => 'Overview' );
     $Self->{LayoutObject}->Block( Name => 'ActionList' );
@@ -257,7 +253,7 @@ sub _Change {
     }
 
     return $Self->{LayoutObject}->Output(
-        TemplateFile => 'AdminResponseChangeDefaultToTemplates',
+        TemplateFile => 'AdminDefaultToTemplates',
         Data         => \%Param,
     );
 }
@@ -273,7 +269,7 @@ sub _Overview {
     # no actions in action list
     #    $Self->{LayoutObject}->Block(Name=>'ActionList');
     $Self->{LayoutObject}->Block( Name => 'FilterTemplate' );
-    $Self->{LayoutObject}->Block( Name => 'FilterResponseChangeDefaultTo' );
+    $Self->{LayoutObject}->Block( Name => 'FilterDefaultTo' );
     $Self->{LayoutObject}->Block( Name => 'OverviewResult' );
 
     # get std template list
@@ -319,15 +315,13 @@ sub _Overview {
     }
 
     # get queue data
-    my %ResponseChangeDefaultToData =
-        $Self->{ResponseChangeDefaultToObject}->List();
+    my %DefaultToData = $Self->{DefaultToObject}->List();
 
     # if there are results to show
-    if (%ResponseChangeDefaultToData) {
+    if (%DefaultToData) {
         for my $ID (
-            sort { uc( $ResponseChangeDefaultToData{$a} ) cmp
-                   uc( $ResponseChangeDefaultToData{$b} ) }
-            keys %ResponseChangeDefaultToData
+            sort { uc( $DefaultToData{$a} ) cmp uc( $DefaultToData{$b} ) }
+            keys %DefaultToData
             )
         {
 
@@ -335,8 +329,8 @@ sub _Overview {
             $Self->{LayoutObject}->Block(
                 Name => 'Listn1',
                 Data => {
-                    Name      => $ResponseChangeDefaultToData{$ID},
-                    Subaction => 'ResponseChangeDefaultTo',
+                    Name      => $DefaultToData{$ID},
+                    Subaction => 'DefaultTo',
                     ID        => $ID,
                 },
             );
@@ -346,14 +340,14 @@ sub _Overview {
     # otherwise it displays a no data found message
     else {
         $Self->{LayoutObject}->Block(
-            Name => 'NoResponseChangeDefaultToFoundMsg',
+            Name => 'NoDefaultToFoundMsg',
             Data => {},
         );
     }
 
     # return output
     return $Self->{LayoutObject}->Output(
-        TemplateFile => 'AdminResponseChangeDefaultToTemplates',
+        TemplateFile => 'AdminDefaultToTemplates',
         Data         => \%Param,
     );
 }
diff --git a/Kernel/Output/HTML/ResponseChangeDefaultTo.pm b/Kernel/Output/HTML/DefaultTo.pm
index b411139..1d09b40 100644
--- a/Kernel/Output/HTML/ResponseChangeDefaultTo.pm
+++ b/Kernel/Output/HTML/DefaultTo.pm
@@ -1,16 +1,16 @@
 # --
-# Kernel/Output/HTML/ResponseChangeDefaultTo.pm
+# Kernel/Output/HTML/DefaultTo.pm
 # Copyright (C) 2015 Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
 # --
 
-package Kernel::Output::HTML::ResponseChangeDefaultTo;
+package Kernel::Output::HTML::DefaultTo;
 
 use strict;
 use warnings;
 
 our @ObjectDependencies = qw(
     Kernel::System::Log
-    Kernel::System::ResponseChangeDefaultTo
+    Kernel::System::DefaultTo
 );
 
 sub new {
@@ -20,8 +20,7 @@ sub new {
     my $Self = {};
     $Self->{LayoutObject} = $Param{LayoutObject} || die "Got no LayoutObject!";
     $Self->{LogObject} = $Kernel::OM->Get('Kernel::System::Log');
-    $Self->{ResponseChangeDefaultToObject} =
-        $Kernel::OM->Get('Kernel::System::ResponseChangeDefaultTo');
+    $Self->{DefaultToObject} = $Kernel::OM->Get('Kernel::System::DefaultTo');
     bless( $Self, $Type );
 
     return $Self;
@@ -31,7 +30,7 @@ sub Run {
     my ( $Self, %Param ) = @_;
     return if !$Self->{LayoutObject};
 
-    for (qw(LogObject LayoutObject ResponseChangeDefaultToObject)) {
+    for (qw(LogObject LayoutObject DefaultToObject)) {
         return if !$Self->{$_};
     }
 
@@ -57,25 +56,23 @@ sub Run {
     } 
 
     # return if not generated from template
-    return unless $Ticket->{ResponseID};
+    return unless $Ticket->{TemplateID};
 
-    # get all ResponseChangeDefaultTo
-    my %MappedResponseChangeDefaultTo =
-        $Self->{ResponseChangeDefaultToObject}->MappingList(
-            ResponseID => $Ticket->{ResponseID},
-        );
+    # get all DefaultTo
+    my %MappedDefaultTo = $Self->{DefaultToObject}->MappingList(
+        TemplateID => $Ticket->{TemplateID},
+    );
 
     my $RemoveDefault = 0;
     my @Addresses = ();
-    foreach my $ID ( values %MappedResponseChangeDefaultTo ) {
-        my %ResponseChangeDefaultTo =
-            $Self->{ResponseChangeDefaultToObject}->Get(
-                ID => $ID,
-            );
-
-        $RemoveDefault = 1 if $ResponseChangeDefaultTo{RemoveDefault};
-        if ( $ResponseChangeDefaultTo{AddNew} ) {
-            push @Addresses, $ResponseChangeDefaultTo{NewAddress};
+    foreach my $ID ( values %MappedDefaultTo ) {
+        my %DefaultTo = $Self->{DefaultToObject}->Get(
+            ID => $ID,
+        );
+
+        $RemoveDefault = 1 if $DefaultTo{RemoveDefault};
+        if ( $DefaultTo{AddNew} ) {
+            push @Addresses, $DefaultTo{NewAddress};
         }
     }
 
diff --git a/Kernel/Output/HTML/Standard/AdminResponseChangeDefaultToTemplates.tt b/Kernel/Output/HTML/Standard/AdminDefaultToTemplates.tt
index 090716f..e3436f7 100644
--- a/Kernel/Output/HTML/Standard/AdminResponseChangeDefaultToTemplates.tt
+++ b/Kernel/Output/HTML/Standard/AdminDefaultToTemplates.tt
@@ -1,5 +1,5 @@
 # --
-# AdminResponseChangeDefaultToTemplates.tt - provides HTML form for AdminInterface
+# AdminDefaultToTemplates.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-ResponseChangeDefaultTo Relations") | html %]</h1>
+    <h1>[% Translate("Manage Template-DefaultTo Relations") | html %]</h1>
 
     <div class="SidebarColumn">
 
@@ -51,16 +51,16 @@
             </div>
         </div>
 [% RenderBlockEnd("FilterTemplate") %]
-[% RenderBlockStart("FilterResponseChangeDefaultTo") %]
+[% RenderBlockStart("FilterDefaultTo") %]
         <div class="WidgetSimple">
             <div class="Header">
-                <h2><label for="FilterResponseChangeDefaultTo">[% Translate("Filter for ResponseChangeDefaultTo") | html %]</label></h2>
+                <h2><label for="FilterDefaultTo">[% Translate("Filter for DefaultTo") | html %]</label></h2>
             </div>
             <div class="Content">
-                <input type="text" id="FilterResponseChangeDefaultTo" class="FilterBox" placeholder="[% Translate("Just start typing to filter...") | html %]" name="FilterResponseChangeDefaultTo" value="" title="[% Translate("Filter for ResponseChangeDefaultTo") | html %]" />
+                <input type="text" id="FilterDefaultTo" class="FilterBox" placeholder="[% Translate("Just start typing to filter...") | html %]" name="FilterDefaultTo" value="" title="[% Translate("Filter for DefaultTo") | html %]" />
             </div>
         </div>
-[% RenderBlockEnd("FilterResponseChangeDefaultTo") %]
+[% RenderBlockEnd("FilterDefaultTo") %]
 
     </div>
 
@@ -85,12 +85,12 @@
                     </ul>
                 </div>
                 <div class="Size1of2">
-                    <ul class="Tablelike" id="ResponseChangeDefaultTo">
-                        <li class="Header">[% Translate("ResponseChangeDefaultTo") | html %]</li>
+                    <ul class="Tablelike" id="DefaultTo">
+                        <li class="Header">[% Translate("DefaultTo") | html %]</li>
                         <li class="FilterMessage Hidden">[% Translate("No matches found.") | html %]</li>
-[% RenderBlockStart("NoResponseChangeDefaultToFoundMsg") %]
+[% RenderBlockStart("NoDefaultToFoundMsg") %]
                         <li>[% Translate("No data found.") | html %]</li>
-[% RenderBlockEnd("NoResponseChangeDefaultToFoundMsg") %]
+[% RenderBlockEnd("NoDefaultToFoundMsg") %]
 [% 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($('#FilterResponseChangeDefaultTo'), $('#ResponseChangeDefaultTo'));
+    Core.UI.Table.InitTableFilter($('#FilterDefaultTo'), $('#DefaultTo'));
 //]]></script>
 [% END %]
 [% RenderBlockEnd("OverviewResult") %]
 [% RenderBlockStart("Change") %]
             <div class="Header">
                 <h2>
-[% RenderBlockStart("ChangeHeaderResponseChangeDefaultTo") %]
-                    [% Translate("Change ResponseChangeDefaultTo Relations for Template") | html %]
-[% RenderBlockEnd("ChangeHeaderResponseChangeDefaultTo") %]
+[% RenderBlockStart("ChangeHeaderDefaultTo") %]
+                    [% Translate("Change DefaultTo Relations for Template") | html %]
+[% RenderBlockEnd("ChangeHeaderDefaultTo") %]
 [% RenderBlockStart("ChangeHeaderTemplate") %]
-                    [% Translate("Change Template Relations for ResponseChangeDefaultTo") | html %]
+                    [% Translate("Change Template Relations for DefaultTo") | 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/ResponseChangeDefaultTo.pm b/Kernel/System/DefaultTo.pm
index 91d80e1..7a1257b 100644
--- a/Kernel/System/ResponseChangeDefaultTo.pm
+++ b/Kernel/System/DefaultTo.pm
@@ -1,5 +1,5 @@
 # --
-# Kernel/System/ResponseChangeDefaultTo.pm - core module
+# Kernel/System/DefaultTo.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::ResponseChangeDefaultTo;
+package Kernel::System::DefaultTo;
 
 use strict;
 use warnings;
@@ -46,9 +46,9 @@ sub Add {
         }
     }
 
-    # insert new ResponseChangeDefaultTo
+    # insert new DefaultTo
     return if !$Self->{DBObject}->Do(
-        SQL => 'INSERT INTO response_change_default_to '
+        SQL => 'INSERT INTO default_to '
              . '(title, remove_default, add_new, new_address) '
              . 'VALUES (?, ?, ?, ?)',
         Bind => [
@@ -61,7 +61,7 @@ sub Add {
 
     # get new id
     return if !$Self->{DBObject}->Prepare(
-        SQL   => 'SELECT MAX(id) FROM response_change_default_to WHERE title = ?',
+        SQL   => 'SELECT MAX(id) FROM default_to WHERE title = ?',
         Bind  => [ \$Param{Title}, ],
         Limit => 1,
     );
@@ -74,7 +74,7 @@ sub Add {
     # log notice
     $Self->{LogObject}->Log(
         Priority => 'notice',
-        Message  => "ResponseChangeDefaultTo '$ID' created successfully!",
+        Message  => "DefaultTo '$ID' created successfully!",
     );
 
     return $ID;
@@ -94,9 +94,9 @@ sub Update {
         }
     }
 
-    # insert new ResponseChangeDefaultTo
+    # insert new DefaultTo
     return if !$Self->{DBObject}->Do(
-        SQL => 'UPDATE response_change_default_to SET title = ?, '
+        SQL => 'UPDATE default_to SET title = ?, '
              . 'remove_default = ?, add_new = ?, new_address = ? '
              . 'WHERE id = ?',
         Bind => [
@@ -126,14 +126,14 @@ sub Get {
     # get RrsponseChangeDefaultTO obejct
     return if !$Self->{DBObject}->Prepare(
         SQL => 'SELECT id, title, remove_default, add_new, new_address '
-             . 'FROM response_change_default_to WHERE id = ?',
+             . 'FROM default_to WHERE id = ?',
         Bind  => [ \$Param{ID} ],
         Limit => 1,
     );
 
-    my %ResponseChangeDefaultTo;
+    my %DefaultTo;
     while ( my @Data = $Self->{DBObject}->FetchrowArray() ) {
-        %ResponseChangeDefaultTo = (
+        %DefaultTo = (
             ID            => $Data[0],
             Title         => $Data[1],
             RemoveDefault => $Data[2],
@@ -143,14 +143,14 @@ sub Get {
     }
 
     # make sure we have a valid object
-    return unless %ResponseChangeDefaultTo;
+    return unless %DefaultTo;
 
     # get the assigned responses
     return if !$Self->{DBObject}->Prepare(
         SQL => 'SELECT id, response_id '
              . 'FROM response_change_default_to_response '
              . 'WHERE response_change_default_to_id = ?',
-        Bind => [ \$ResponseChangeDefaultTo{ID} ],
+        Bind => [ \$DefaultTo{ID} ],
     );
 
     while ( my @Data = $Self->{DBObject}->FetchrowArray() ) {
@@ -160,14 +160,14 @@ sub Get {
             );
 
         if ( $Response ) {
-            $ResponseChangeDefaultTo{Responses}->{$Data[0]} = {
+            $DefaultTo{Responses}->{$Data[0]} = {
                 ID => $Data[1],
                 Name => $Response,
             };
         }        
     }
 
-    return %ResponseChangeDefaultTo;
+    return %DefaultTo;
 }
 
 sub Delete {
@@ -184,14 +184,14 @@ sub Delete {
 
     # delete mapping
     return if !$Self->{DBObject}->Do(
-        SQL => 'DELETE FROM response_change_default_to_response '
-             . 'WHERE response_change_default_to_id = ?',
+        SQL => 'DELETE FROM default_to_response '
+             . 'WHERE default_to_id = ?',
         Bind => [ \$Param{ID} ],
     );
 
     # delete entry
     return $Self->{DBObject}->Do(
-        SQL => 'DELETE FROM response_change_default_to WHERE id = ?',
+        SQL => 'DELETE FROM default_to WHERE id = ?',
         Bind  => [ \$Param{ID} ],
     );
 }
@@ -200,22 +200,22 @@ sub List {
     my ( $Self, %Param ) = @_;
 
     $Self->{DBObject}->Prepare(
-        SQL => 'SELECT id, title FROM response_change_default_to',
+        SQL => 'SELECT id, title FROM default_to',
     );
 
-    my %ResponseChangeDefaultTo;
+    my %DefaultTo;
     while ( my @Data = $Self->{DBObject}->FetchrowArray() ) {
-        $ResponseChangeDefaultTo{ $Data[0] } = $Data[1];
+        $DefaultTo{ $Data[0] } = $Data[1];
     }
 
-    return %ResponseChangeDefaultTo;
+    return %DefaultTo;
 }
 
 sub MappingAdd {
     my ( $Self, %Param ) = @_;
 
     # check needed stuff
-    for my $Needed (qw(ResponseID ResponseChangeDefaultToID)) {
+    for my $Needed (qw(TemplateID DefaultToID)) {
         if ( !$Param{$Needed} ) {
             $Self->{LogObject}->Log(
                 Priority => 'error',
@@ -227,21 +227,21 @@ sub MappingAdd {
 
     # insert new mapping
     return if !$Self->{DBObject}->Do(
-        SQL => 'INSERT INTO response_change_default_to_response '
-             . '(response_id, response_change_default_to_id) VALUES (?, ?)',
+        SQL => 'INSERT INTO default_to_response '
+             . '(template_id, default_to_id) VALUES (?, ?)',
         Bind => [
-            \$Param{ResponseID},
-            \$Param{ResponseChangeDefaultToID},
+            \$Param{TemplateID},
+            \$Param{DefaultToID},
         ],
     );
 
     # get new id
     return if !$Self->{DBObject}->Prepare(
-        SQL   => 'SELECT MAX(id) FROM response_change_default_to_response '
-               . 'WHERE response_id = ? AND response_change_default_to_id = ?',
+        SQL   => 'SELECT MAX(id) FROM default_to_response '
+               . 'WHERE template_id = ? AND default_to_id = ?',
         Bind  => [
-            \$Param{ResponseID},
-            \$Param{ResponseChangeDefaultToID}, ],
+            \$Param{TemplateID},
+            \$Param{DefaultToID}, ],
         Limit => 1,
     );
 
@@ -253,7 +253,7 @@ sub MappingAdd {
     # log notice
     $Self->{LogObject}->Log(
         Priority => 'notice',
-        Message  => "ResponseChangeDefaultTo mapping '$ID' "
+        Message  => "DefaultTo mapping '$ID' "
                   . "created successfully!",
     );
 
@@ -274,7 +274,7 @@ sub MappingDelete {
 
     # delete mapping
     return $Self->{DBObject}->Do(
-        SQL => 'DELETE FROM response_change_default_to_response '
+        SQL => 'DELETE FROM default_to_response '
              . 'WHERE id = ?',
         Bind => [ \$Param{ID} ],
     );
@@ -284,29 +284,29 @@ sub MappingList {
     my ( $Self, %Param ) = @_;
 
      # check needed stuff
-    if ( !$Param{ResponseID} && !$Param{ResponseChangeDefaultToID} ) {
+    if ( !$Param{TemplateID} && !$Param{DefaultToID} ) {
         $Self->{LogObject}->Log(
             Priority => 'error',
-            Message  => 'Got no ResponseID or ResponseChangeDefaultToID!'
+            Message  => 'Got no TemplateID or DefaultToID!'
         );
         return;
     }
 
     # find mapped objects
-    if ( $Param{ResponseID} ) {
+    if ( $Param{TemplateID} ) {
         $Self->{DBObject}->Prepare(
-            SQL => 'SELECT id, response_change_default_to_id '
-                 . 'FROM response_change_default_to_response '
-                 . 'WHERE response_id = ?',
-            Bind => [ \$Param{ResponseID}, ],
+            SQL => 'SELECT id, default_to_id '
+                 . 'FROM default_to_response '
+                 . 'WHERE template_id = ?',
+            Bind => [ \$Param{TemplateID}, ],
         );
     }
     else {
         $Self->{DBObject}->Prepare(
-            SQL => 'SELECT id, response_id '
-                 . 'FROM response_change_default_to_response '
-                 . 'WHERE response_change_default_to_id = ?',
-            Bind => [ \$Param{ResponseChangeDefaultToID}, ],
+            SQL => 'SELECT id, template_id '
+                 . 'FROM default_to_response '
+                 . 'WHERE default_to_id = ?',
+            Bind => [ \$Param{DefaultToID}, ],
         );
     }
 
diff --git a/ResponseChangeDefaultTo.sopm b/ResponseChangeDefaultTo.sopm
deleted file mode 100644
index f0fd854..0000000
--- a/ResponseChangeDefaultTo.sopm
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<otrs_package version="1.0">
-  <Name>ResponseChangeDefaultTo</Name>
-  <Version>1.0.0</Version>
-  <Framework>4.0.x</Framework>
-  <Vendor>spline.de</Vendor>
-  <URL>http://www.spline.de/</URL>
-  <License>GNU AFFERO GENERAL PUBLIC LICENSE Version 3, November 2007</License>
-  <Description Lang="en"></Description>
-  <Description Lang="de"></Description>
-  <BuildDate>?</BuildDate>
-  <BuildHost>?</BuildHost>
-  <Filelist>
-    <File Permission="644" Location="Kernel/Config/Files/ResponseChangeDefaultTo.xml"/>
-    <File Permission="644" Location="Kernel/Modules/AdminResponseChangeDefaultToTemplates.pm"/>
-    <File Permission="644" Location="Kernel/Output/HTML/ResponseChangeDefaultTo.pm"/>
-    <File Permission="644" Location="Kernel/Output/HTML/Standard/AdminResponseChangeDefaultToTemplates.tt"/>
-    <File Permission="644" Location="Kernel/System/ResponseChangeDefaultTo.pm"/>
-  </Filelist>
-  <DatabaseInstall>
-    <TableCreate Name="response_change_default_to">
-      <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"/>
-      <Column Name="add_new" Required="true" Type="SMALLINT"/>
-      <Column Name="new_address" Required="false" Size="255" Type="VARCHAR"/>
-      <Index Name="response_change_default_to_title">
-        <IndexColumn Name="title"/>
-      </Index>
-      <Unique Name="response_change_default_to_unique_title">
-        <UniqueColumn Name="title"/>
-      </Unique>
-    </TableCreate>
-    <TableCreate Name="response_change_default_to_response">
-      <Column Name="id" Required="true" PrimaryKey="true" AutoIncrement="true" Type="BIGINT"/>
-      <Column Name="response_change_default_to_id" Required="true" Type="BIGINT"/>
-      <Column Name="response_id" Required="true" Type="BIGINT"/>
-      <Index Name="response_change_default_to_response_response_change_default_to_id">
-        <IndexColumn Name="response_change_default_to_id"/>
-      </Index>
-      <Index Name="response_change_default_to_response_response_id">
-        <IndexColumn Name="response_id"/>
-      </Index>
-      <Unique Name="response_change_default_to_response_map">
-        <UniqueColumn Name="response_change_default_to_id"/>
-        <UniqueColumn Name="response_id"/>
-      </Unique>
-      <ForeignKey ForeignTable="response_change_default_to">
-        <Reference Local="response_change_default_to_id" Foreign="id"/>
-      </ForeignKey>
-      <ForeignKey ForeignTable="standard_template">
-        <Reference Local="response_id" Foreign="id"/>
-      </ForeignKey>
-    </TableCreate>
-  </DatabaseInstall>
-  <DatabaseUninstall>
-    <TableDrop Name="response_change_default_to_response"/>
-    <TableDrop Name="response_change_default_to"/>
-  </DatabaseUninstall>
-</otrs_package>