diff --git a/lib/WebGUI/Macro/AdminToggle.pm b/lib/WebGUI/Macro/AdminToggle.pm
index 5524f0dd1..493799b69 100644
--- a/lib/WebGUI/Macro/AdminToggle.pm
+++ b/lib/WebGUI/Macro/AdminToggle.pm
@@ -60,7 +60,7 @@ sub process {
         $var{'toggle.text'} = $turnOn || $i18n->get(516);
     }
     my $template = $templateName    ? WebGUI::Asset::Template->newByUrl($session, $templateName)
-                                    : WebGUI::Asset::Template->new($session, "PBtmpl0000000000000036");
+                                    : WebGUI::Asset::Template->newById($session, "PBtmpl0000000000000036");
     return $template->process(\%var);
 }
 
diff --git a/lib/WebGUI/Macro/EditableToggle.pm b/lib/WebGUI/Macro/EditableToggle.pm
index 2a7f6c9b0..c66b325fd 100644
--- a/lib/WebGUI/Macro/EditableToggle.pm
+++ b/lib/WebGUI/Macro/EditableToggle.pm
@@ -48,28 +48,30 @@ The URL of a template from the Macro/EditableToggle namespace to use for formatt
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
-         if ($session->asset && $session->asset->canEdit && $session->user->isInGroup(12)) {
-        	my %var;
-              my @param = @_;
-	      my $i18n = WebGUI::International->new($session,'Macro_EditableToggle');
-              my $turnOn = $param[0] || $i18n->get(516);
-              my $turnOff = $param[1] || $i18n->get(517);
-                 if ($session->var->isAdminOn) {
-                      $var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
-                      $var{'toggle.text'} = $turnOff;
-                 } else {
-                      $var{'toggle.url'} = $session->url->page('op=switchOnAdmin');
-                      $var{'toggle.text'} = $turnOn;
-                 }
-		if ($param[2]) {
-         		return  WebGUI::Asset::Template->newByUrl($session,$param[2])->process(\%var);
-		} else {
-         		return  WebGUI::Asset::Template->new($session,"PBtmpl0000000000000038")->process(\%var);
-                }
-       }
-       return "";
-}
+    my $session = shift;
+    if ( $session->asset && $session->asset->canEdit && $session->user->isInGroup(12) ) {
+        my %var;
+        my @param   = @_;
+        my $i18n    = WebGUI::International->new( $session, 'Macro_EditableToggle' );
+        my $turnOn  = $param[0] || $i18n->get(516);
+        my $turnOff = $param[1] || $i18n->get(517);
+        if ( $session->var->isAdminOn ) {
+            $var{'toggle.url'}  = $session->url->page('op=switchOffAdmin');
+            $var{'toggle.text'} = $turnOff;
+        }
+        else {
+            $var{'toggle.url'}  = $session->url->page('op=switchOnAdmin');
+            $var{'toggle.text'} = $turnOn;
+        }
+        if ( $param[2] ) {
+            return WebGUI::Asset::Template->newByUrl( $session, $param[2] )->process( \%var );
+        }
+        else {
+            return WebGUI::Asset::Template->newById( $session, "PBtmpl0000000000000038" )->process( \%var );
+        }
+    } ## end if ( $session->asset &&...)
+    return "";
+} ## end sub process
 
 1;
 
diff --git a/lib/WebGUI/Macro/GroupAdd.pm b/lib/WebGUI/Macro/GroupAdd.pm
index 24fb1f9b8..1e20ea0d1 100644
--- a/lib/WebGUI/Macro/GroupAdd.pm
+++ b/lib/WebGUI/Macro/GroupAdd.pm
@@ -57,7 +57,7 @@ sub process {
 	if ($template) {
 		return  WebGUI::Asset::Template->newByUrl($session,$template)->process(\%var);
 	} else {
-		return  WebGUI::Asset::Template->new($session,"PBtmpl0000000000000040")->process(\%var);
+		return  WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000040")->process(\%var);
 	}
 }
 
diff --git a/lib/WebGUI/Macro/GroupDelete.pm b/lib/WebGUI/Macro/GroupDelete.pm
index ab0ea28d8..0fbc9de58 100644
--- a/lib/WebGUI/Macro/GroupDelete.pm
+++ b/lib/WebGUI/Macro/GroupDelete.pm
@@ -57,7 +57,7 @@ sub process {
 	if ($template) {
 		return  WebGUI::Asset::Template->newByUrl($session,$template)->process(\%var);
 	} else {
-		return  WebGUI::Asset::Template->new($session,"PBtmpl0000000000000041")->process(\%var);
+		return  WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000041")->process(\%var);
 	}
 }
 
diff --git a/lib/WebGUI/Macro/H_homeLink.pm b/lib/WebGUI/Macro/H_homeLink.pm
index b58e3898e..3e5199425 100644
--- a/lib/WebGUI/Macro/H_homeLink.pm
+++ b/lib/WebGUI/Macro/H_homeLink.pm
@@ -57,7 +57,7 @@ sub process {
 		if ($templateUrl) {
          		return WebGUI::Asset::Template->newByUrl($session,$templateUrl)->process(\%var);
 		} else {
-         		return WebGUI::Asset::Template->new($session,"PBtmpl0000000000000042")->process(\%var);
+         		return WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000042")->process(\%var);
 		}
 	}
 	return $home->getUrl;
diff --git a/lib/WebGUI/Macro/L_loginBox.pm b/lib/WebGUI/Macro/L_loginBox.pm
index a747b1cae..a2b82b8da 100644
--- a/lib/WebGUI/Macro/L_loginBox.pm
+++ b/lib/WebGUI/Macro/L_loginBox.pm
@@ -127,7 +127,7 @@ sub process {
         $var{'account.create.url'} = $session->url->page('op=auth;method=createAccount');
 	$var{'account.create.label'} = $i18n->get(407, 'WebGUI');
 	$var{'form.footer'} = WebGUI::Form::formFooter($session,);
-        return WebGUI::Asset::Template->new($session,$templateId)->process(\%var); 
+        return WebGUI::Asset::Template->newById($session,$templateId)->process(\%var); 
 }
 
 1;
diff --git a/lib/WebGUI/Macro/LoginToggle.pm b/lib/WebGUI/Macro/LoginToggle.pm
index 074931a29..232c84029 100644
--- a/lib/WebGUI/Macro/LoginToggle.pm
+++ b/lib/WebGUI/Macro/LoginToggle.pm
@@ -63,7 +63,7 @@ sub process {
 	if ($param[2]) {
 		return  WebGUI::Asset::Template->newByUrl($session,$param[2])->process(\%var);
 	} else {
-		return  WebGUI::Asset::Template->new($session,"PBtmpl0000000000000043")->process(\%var);
+		return  WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000043")->process(\%var);
 	}
 }
 
diff --git a/lib/WebGUI/Macro/MiniCart.pm b/lib/WebGUI/Macro/MiniCart.pm
index 96ee68fd4..60f36df10 100644
--- a/lib/WebGUI/Macro/MiniCart.pm
+++ b/lib/WebGUI/Macro/MiniCart.pm
@@ -59,7 +59,7 @@ sub process {
 		totalPrice		=> sprintf("%.2f",$totalPrice),
 		totalItems		=> $totalItems,
 		);
-	my $template = WebGUI::Asset::Template->new($session, $templateId || 'EBlxJpZQ9o-8VBOaGQbChA');
+	my $template = WebGUI::Asset::Template->newById($session, $templateId || 'EBlxJpZQ9o-8VBOaGQbChA');
 	return $template->process(\%var);
 }
 
diff --git a/lib/WebGUI/Macro/RandomThread.pm b/lib/WebGUI/Macro/RandomThread.pm
index e24b341e7..a1e43ee89 100644
--- a/lib/WebGUI/Macro/RandomThread.pm
+++ b/lib/WebGUI/Macro/RandomThread.pm
@@ -80,7 +80,7 @@ sub process {
 		return '';
 	}
 
-	my $template = eval { $templateURL ? WebGUI::Asset::Template->newByUrl($session,$templateURL) : WebGUI::Asset::Template->new($session,'WVtmpl0000000000000001'); };
+	my $template = eval { $templateURL ? WebGUI::Asset::Template->newByUrl($session,$templateURL) : WebGUI::Asset::Template->newById($session,'WVtmpl0000000000000001'); };
 	if (Exception::Class->caught()) {
 		$session->errorHandler->warn('Error: invalid template URL. Check parameters of macro on page '.$session->asset->url);
 		return '';
@@ -98,7 +98,7 @@ sub process {
 	foreach my $csid (@{$lineage}) {
 	   my $cs = undef;
 	   # Get random thread in that CS:
-	   $cs = WebGUI::Asset::Wobject::Collaboration->new($session,$csid);
+	   $cs = WebGUI::Asset::Wobject::Collaboration->newById($session,$csid);
 	   my $threads = $cs->getLineage(['children'],{includeOnlyClasses => ['WebGUI::Asset::Post::Thread']});
 	   push(@llist,$csid) if (scalar(@{$threads}) > 0);
 	}
@@ -152,13 +152,13 @@ sub _getRandomThread {
 	# Get random CS:
 	my $randomIndex = int(rand(scalar(@{$lineage})));
 	my $randomCSId = $lineage->[$randomIndex];
-	my $randomCS = WebGUI::Asset::Wobject::Collaboration->new($session, $randomCSId);
+	my $randomCS = WebGUI::Asset::Wobject::Collaboration->newById($session, $randomCSId);
 
 	# Get random thread in that CS:
 	$lineage = $randomCS->getLineage(['children'], {includeOnlyClasses => ['WebGUI::Asset::Post::Thread']});
 	$randomIndex = int(rand(scalar(@{$lineage})));
 	my $randomThreadId = $lineage->[$randomIndex];
-	return WebGUI::Asset::Post::Thread->new($session, $randomThreadId);
+	return WebGUI::Asset::Post::Thread->newById($session, $randomThreadId);
 }
 
 1;
diff --git a/lib/WebGUI/Macro/UsersOnline.pm b/lib/WebGUI/Macro/UsersOnline.pm
index 351cd186e..2516b1835 100644
--- a/lib/WebGUI/Macro/UsersOnline.pm
+++ b/lib/WebGUI/Macro/UsersOnline.pm
@@ -118,7 +118,7 @@ sub process {
 	$var{'lastActivity_label'} = $i18n->get("Last Activity");
 	
 	# Process Template
-	return WebGUI::Asset::Template->new($session,$templateId)->process(\%var);
+	return WebGUI::Asset::Template->newById($session,$templateId)->process(\%var);
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Macro/a_account.pm b/lib/WebGUI/Macro/a_account.pm
index fa7cb54ee..3f6821318 100644
--- a/lib/WebGUI/Macro/a_account.pm
+++ b/lib/WebGUI/Macro/a_account.pm
@@ -47,9 +47,9 @@ sub process {
 	$var{'account.url'} = $session->url->page('op=auth;method=init');
 	$var{'account.text'} = $param[0] || $i18n->get(46);
 	if ($param[1]) {
-		return  WebGUI::Asset::Template->newByUrl($session,$param[1])->process(\%var);
+		return  WebGUI::Asset::Template->newByUrl($session, $param[1])->process(\%var);
 	} else {
-		return  WebGUI::Asset::Template->new($session,"PBtmpl0000000000000037")->process(\%var);
+		return  WebGUI::Asset::Template->newById($session, "PBtmpl0000000000000037")->process(\%var);
 	}
 }
 
diff --git a/lib/WebGUI/Macro/r_printable.pm b/lib/WebGUI/Macro/r_printable.pm
index ce2c3dfd5..6cad925a5 100644
--- a/lib/WebGUI/Macro/r_printable.pm
+++ b/lib/WebGUI/Macro/r_printable.pm
@@ -71,7 +71,7 @@ sub process {
 		if ($param[2]) {
          		$temp =  WebGUI::Asset::Template->newByUrl($session,$param[2])->process(\%var);
 		} else {
-         		$temp =  WebGUI::Asset::Template->new($session,"PBtmpl0000000000000045")->process(\%var);
+         		$temp =  WebGUI::Asset::Template->newById($session,"PBtmpl0000000000000045")->process(\%var);
 		}
 	}
 	return $temp;