diff --git a/installer/install.pl b/installer/install.pl
index 687d35e034..5b065e87b8 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -10,6 +10,7 @@ use IPC::Cmd;
 
 use C4::Context;
 use C4::Output;
+use C4::Templates;
 use C4::Languages qw(getAllLanguages getTranslatedLanguages);
 use C4::Installer;
 
@@ -22,7 +23,7 @@ my ( $template, $loggedinuser, $cookie );
 my $all_languages = getAllLanguages();
 
 if ( defined($language) ) {
-    setlanguagecookie( $query, $language, "install.pl?step=1" );
+    C4::Templates::setlanguagecookie( $query, $language, "install.pl?step=1" );
 }
 ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
diff --git a/opac/changelanguage.pl b/opac/changelanguage.pl
index 22b73e4791..0b31d433b3 100755
--- a/opac/changelanguage.pl
+++ b/opac/changelanguage.pl
@@ -18,11 +18,11 @@
 #use strict;
 #use warnings; FIXME - Bug 2505
 
-use C4::Output;
+use C4::Templates;
 use CGI;
 
 my $query    = new CGI;
 my $language = $query->param('language');
 my $url      = $query->referer();
 
-setlanguagecookie( $query, $language, $url );
+C4::Templates::setlanguagecookie( $query, $language, $url );