diff --git a/MANIFEST b/MANIFEST
index 4302cf6..a66a846 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,7 +1,7 @@
-html/Callbacks/RTx-UpdateHistory/Elements/Header/Head
-html/Callbacks/RTx-UpdateHistory/Ticket/Update.html/RightColumnBottom
-html/NoAuth/css/rtx-updatehistory.css
-html/Ticket/Elements/rtx-updatehistory-inline
+html/Callbacks/RT-Extension-UpdateHistory/Elements/Header/Head
+html/Callbacks/RT-Extension-UpdateHistory/Ticket/Update.html/RightColumnBottom
+html/NoAuth/css/RT-Extension-UpdateHistory.css
+html/Ticket/Elements/RT-Extension-UpdateHistory-inline
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
@@ -15,7 +15,7 @@ inc/Module/Install/RTx/Runtime.pm
 inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
 inc/YAML/Tiny.pm
-lib/RTx/UpdateHistory.pm
+lib/RT/Extension/UpdateHistory.pm
 Makefile.PL
 MANIFEST			This list of files
 META.yml
diff --git a/META.yml b/META.yml
index e898981..0d3db89 100644
--- a/META.yml
+++ b/META.yml
@@ -1,5 +1,5 @@
 ---
-abstract: 'RTx-UpdateHistory Extension'
+abstract: 'RT-Extension-UpdateHistory Extension'
 author:
   - 'NETWAYS GmbH <info@netways.de>'
 build_requires:
@@ -13,7 +13,7 @@ license: gpl_2
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
   version: 1.4
-name: RTx-UpdateHistory
+name: RT-Extension-UpdateHistory
 no_index:
   directory:
     - inc
diff --git a/Makefile.PL b/Makefile.PL
index b20c323..4e9889e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,6 +1,6 @@
 use inc::Module::Install;
 
-RTx     'RTx-UpdateHistory';
+RTx     'RT-Extension-UpdateHistory';
 license 'gpl_2';
 repository 'https://github.com/NETWAYS/rt-extension-updatehistory';
 
diff --git a/html/Callbacks/RT-Extension-UpdateHistory/Elements/Header/Head b/html/Callbacks/RT-Extension-UpdateHistory/Elements/Header/Head
new file mode 100644
index 0000000..f1f283c
--- /dev/null
+++ b/html/Callbacks/RT-Extension-UpdateHistory/Elements/Header/Head
@@ -0,0 +1 @@
+<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/RT-Extension-UpdateHistory.css" type="text/css" media="all" />
diff --git a/html/Callbacks/RT-Extension-UpdateHistory/Ticket/Update.html/RightColumnBottom b/html/Callbacks/RT-Extension-UpdateHistory/Ticket/Update.html/RightColumnBottom
new file mode 100644
index 0000000..6b9e49d
--- /dev/null
+++ b/html/Callbacks/RT-Extension-UpdateHistory/Ticket/Update.html/RightColumnBottom
@@ -0,0 +1,4 @@
+<& /Ticket/Elements/RT-Extension-UpdateHistory-inline, Ticket => $Ticket &>
+<%ARGS>
+	$Ticket => undef
+</%ARGS>
diff --git a/html/Callbacks/RTx-UpdateHistory/Elements/Header/Head b/html/Callbacks/RTx-UpdateHistory/Elements/Header/Head
deleted file mode 100644
index b492820..0000000
--- a/html/Callbacks/RTx-UpdateHistory/Elements/Header/Head
+++ /dev/null
@@ -1 +0,0 @@
-<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/rtx-updatehistory.css" type="text/css" media="all" />
\ No newline at end of file
diff --git a/html/Callbacks/RTx-UpdateHistory/Ticket/Update.html/RightColumnBottom b/html/Callbacks/RTx-UpdateHistory/Ticket/Update.html/RightColumnBottom
deleted file mode 100644
index 15cfeb6..0000000
--- a/html/Callbacks/RTx-UpdateHistory/Ticket/Update.html/RightColumnBottom
+++ /dev/null
@@ -1,4 +0,0 @@
-<& /Ticket/Elements/rtx-updatehistory-inline, Ticket => $Ticket &>
-<%ARGS>
-	$Ticket => undef
-</%ARGS>
\ No newline at end of file
diff --git a/html/NoAuth/css/rtx-updatehistory.css b/html/NoAuth/css/RT-Extension-UpdateHistory.css
similarity index 84%
rename from html/NoAuth/css/rtx-updatehistory.css
rename to html/NoAuth/css/RT-Extension-UpdateHistory.css
index fe38090..093bfe7 100644
--- a/html/NoAuth/css/rtx-updatehistory.css
+++ b/html/NoAuth/css/RT-Extension-UpdateHistory.css
@@ -1,7 +1,7 @@
-.rtx-update-history-box {
+.rt-extension-update-history-box {
     height: 600px;
     overflow: scroll;
-    
+
 }
 
 .update-table-struct {
diff --git a/html/Ticket/Elements/rtx-updatehistory-inline b/html/Ticket/Elements/RT-Extension-UpdateHistory-inline
similarity index 70%
rename from html/Ticket/Elements/rtx-updatehistory-inline
rename to html/Ticket/Elements/RT-Extension-UpdateHistory-inline
index ef28fd6..c8be175 100644
--- a/html/Ticket/Elements/rtx-updatehistory-inline
+++ b/html/Ticket/Elements/RT-Extension-UpdateHistory-inline
@@ -1,14 +1,14 @@
-<div class="rtx-update-history-box">
+<div class="rt-extension-update-history-box">
 <& /Elements/ShowHistory,
     Object => $Ticket,
-    ShowHeaders => $ARGS{'ShowHeaders'}, 
+    ShowHeaders => $ARGS{'ShowHeaders'},
     Attachments => $Ticket->Attachments,
     AttachmentContent => $Ticket->TextAttachments,
     DisplayPath => $URI,
     ShowDisplayModes => 0
-    &> 
+    &>
 </div>
 <%args>
 	$Ticket => undef
 	$URI => 'Update.html'
-</%args>
\ No newline at end of file
+</%args>
diff --git a/lib/RT/Extension/UpdateHistory.pm b/lib/RT/Extension/UpdateHistory.pm
new file mode 100644
index 0000000..d688bff
--- /dev/null
+++ b/lib/RT/Extension/UpdateHistory.pm
@@ -0,0 +1,76 @@
+package RT::Extension::UpdateHistory;
+
+require 5.10.0;
+
+use strict;
+use warnings;
+
+our $VERSION = '1.0.0';
+
+=head1 NAME
+
+RT-Extension-UpdateHistory - Allows to view a ticket's history while commenting/replying
+
+=head1 DESCRIPTION
+
+The default behavior of RT when adding a comment or reply is to not display the ticket's history.
+
+This extension adds an additional element to the sidebar where an configurable amount of recent
+activities are listed.
+
+=head1 RT VERSION
+
+Works with RT 4.4.2
+
+=head1 INSTALLATION
+
+=over
+
+=item C<perl Makefile.PL>
+
+=item C<make>
+
+=item C<make install>
+
+May need root permissions
+
+=item Edit your F</opt/rt4/etc/RT_SiteConfig.pm>
+
+Add this line:
+
+    Plugin('RT::Extension::UpdateHistory');
+
+=item Clear your mason cache
+
+    rm -rf /opt/rt4/var/mason_data/obj
+
+=item Restart your webserver
+
+=back
+
+=head1 AUTHOR
+
+NETWAYS GmbH <lt>info@netways.de<gt>
+
+=for html <p>All bugs should be reported via email to <a
+href="mailto:bug-RT-Extension-UpdateHistory@rt.cpan.org">bug-RT-Extension-UpdateHistory@rt.cpan.org</a>
+or via the web at <a
+href="http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-UpdateHistory">rt.cpan.org</a>.</p>
+
+=for text
+    All bugs should be reported via email to
+        bug-RT-Extension-UpdateHistory@rt.cpan.org
+    or via the web at
+        http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-UpdateHistory
+
+=head1 LICENSE AND COPYRIGHT
+
+This software is Copyright (c) 2018 by NETWAYS GmbH
+
+This is free software, licensed under:
+
+  The GNU General Public License, Version 2, June 1991
+
+=cut
+
+1;
diff --git a/lib/RTx/UpdateHistory.pm b/lib/RTx/UpdateHistory.pm
deleted file mode 100644
index 72a80ab..0000000
--- a/lib/RTx/UpdateHistory.pm
+++ /dev/null
@@ -1,39 +0,0 @@
-package RTx::UpdateHistory;
-
-require 5.10.0;
-
-use strict;
-use version;
-
-our $VERSION = "1.0.0";
-
-1;
-=pod
-
-=head1 NAME
-
-RTx::UpdateHistory
-
-=head1 DESCRIPTION
-
-Provides a inline box to display ticket history while replying or comment
-on ticketse to determine what was going on there.
-
-=head1 VERSION
-
-version 1.0.0
-
-=head1 AUTHOR
-
-Marius Hein <marius.hein@netways.de>
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is Copyright (c) 2012 by NETWAYS GmbH <info@netways.de>
-
-This is free software, licensed under:
-	GPL Version 2, June 1991
-
-=cut
-
-__END__