diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php
index 456233a0..088b263e 100644
--- a/lam/templates/main_header.php
+++ b/lam/templates/main_header.php
@@ -1,4 +1,5 @@
 <?php
+namespace LAM\HEADER;
 /*
 $Id$
 
@@ -204,7 +205,7 @@ jQuery(document).ready(function() {
 <?php
 
 function printTypeTabs($headerPrefix) {
-	$typeManager = new LAM\TYPES\TypeManager();
+	$typeManager = new \LAM\TYPES\TypeManager();
 	$types = $typeManager->getConfiguredTypes();
 	$linkList = array();
 	foreach ($types as $type) {
diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php
index 7ac135d2..311c23f6 100644
--- a/lam/templates/profedit/profilemain.php
+++ b/lam/templates/profedit/profilemain.php
@@ -1,4 +1,20 @@
 <?php
+namespace LAM\TOOLS\PROFILE_EDITOR;
+use \htmlTable;
+use \htmlTitle;
+use \htmlStatusMessage;
+use \LAMCfgMain;
+use \htmlSubTitle;
+use \htmlSpacer;
+use \htmlSelect;
+use \htmlButton;
+use \htmlImage;
+use \htmlLink;
+use \htmlOutputText;
+use \htmlHelpLink;
+use \htmlHiddenInput;
+use \htmlInputField;
+use \htmlDiv;
 /*
 $Id$
 
@@ -51,7 +67,7 @@ if (!empty($_POST)) {
 	validateSecurityToken();
 }
 
-$typeManager = new LAM\TYPES\TypeManager();
+$typeManager = new \LAM\TYPES\TypeManager();
 $types = $typeManager->getConfiguredTypes();
 $profileClasses = array();
 $profileClassesTemp = array();
diff --git a/lam/templates/profedit/profilepage.php b/lam/templates/profedit/profilepage.php
index b5f57425..07866e25 100644
--- a/lam/templates/profedit/profilepage.php
+++ b/lam/templates/profedit/profilepage.php
@@ -1,4 +1,13 @@
 <?php
+namespace LAM\TOOLS\PROFILE_EDITOR;
+use \htmlTable;
+use \htmlTitle;
+use \htmlTableExtendedInputField;
+use \htmlSpacer;
+use \htmlTableExtendedSelect;
+use \htmlFieldset;
+use \htmlButton;
+use \htmlHiddenInput;
 /*
 $Id$
 
@@ -69,7 +78,7 @@ if (isset($_POST['accounttype'])) {
 	$_GET['type'] = $_POST['accounttype'];
 }
 
-$typeManager = new LAM\TYPES\TypeManager();
+$typeManager = new \LAM\TYPES\TypeManager();
 $type = $typeManager->getConfiguredType($_GET['type']);
 if ($type->isHidden() || !checkIfWriteAccessIsAllowed($_GET['type'])) {
 	logNewMessage(LOG_ERR, 'User tried to access hidden account type profile: ' . $_GET['type']);