diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 2a80f9388..07333d662 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -21,10 +21,10 @@ use JSON;
 use HTML::Packer;
 
 use WebGUI::Definition::Asset;
-aspect assetName  => 'asset';
-aspect tableName  => 'assetData';
-aspect icon       => 'assets.gif';
-aspect uiLevel    => 1;
+define assetName  => 'asset';
+define tableName  => 'assetData';
+define icon       => 'assets.gif';
+define uiLevel    => 1;
 property  title => (
             tab             => "properties",
             label           => ['99','Asset'],
diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index c08ad0266..83a53cc1d 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -29,9 +29,9 @@ use Storable;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
-aspect assetName   => ['assetName', 'Asset_Event'];
-aspect icon        => 'calendar.gif';
-aspect tableName   => 'Event';
+define assetName   => ['assetName', 'Asset_Event'];
+define icon        => 'calendar.gif';
+define tableName   => 'Event';
 property description => (
             label           => ['description', 'Asset_Event'],
             fieldType       => "HTMLArea",
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 53727b38f..a755f4265 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -21,8 +21,8 @@ use Carp;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
 
-aspect assetName => ['assetName', 'Asset_File'];
-aspect tableName => 'FileAsset';
+define assetName => ['assetName', 'Asset_File'];
+define tableName => 'FileAsset';
 property cacheTimeout => (
                 tab       => "display",
                 fieldType => "interval",
diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm
index b6a62a752..92708847c 100644
--- a/lib/WebGUI/Asset/File/GalleryFile.pm
+++ b/lib/WebGUI/Asset/File/GalleryFile.pm
@@ -17,8 +17,8 @@ package WebGUI::Asset::File::GalleryFile;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::File';
-aspect assetName           => ['assetName', 'Asset_GalleryFile'];
-aspect tableName           => 'GalleryFile';
+define assetName           => ['assetName', 'Asset_GalleryFile'];
+define tableName           => 'GalleryFile';
 property views => (
             noFormPost          => 1,
             default             => 0,
diff --git a/lib/WebGUI/Asset/File/GalleryFile/Photo.pm b/lib/WebGUI/Asset/File/GalleryFile/Photo.pm
index eee7ca776..a8bdea24f 100644
--- a/lib/WebGUI/Asset/File/GalleryFile/Photo.pm
+++ b/lib/WebGUI/Asset/File/GalleryFile/Photo.pm
@@ -17,9 +17,9 @@ package WebGUI::Asset::File::GalleryFile::Photo;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::File::GalleryFile';
-aspect assetName           => ['assetName', 'Asset_Photo'];
-aspect icon                => 'photo.gif';
-aspect tableName           => 'Photo';
+define assetName           => ['assetName', 'Asset_Photo'];
+define icon                => 'photo.gif';
+define tableName           => 'Photo';
 property exifData => (
             fieldType           => 'text',
             noFormPost          => 1,
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 1ca02e2aa..9064eae33 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -22,9 +22,9 @@ use WebGUI::Form::Image;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::File';
-aspect   assetName     => ['assetName', 'Asset_Image'];
-aspect   tableName     => 'ImageAsset';
-aspect   icon          => 'image.gif';
+define assetName     => ['assetName', 'Asset_Image'];
+define tableName     => 'ImageAsset';
+define icon          => 'image.gif';
 property thumbnailSize => (
                 label           => ['thumbnail size', 'Asset_Image'],
                 hoverHelp       => ['Thumbnail size description', 'Asset_Image'],
diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm
index 51220ec2f..cda5d5c14 100644
--- a/lib/WebGUI/Asset/File/ZipArchive.pm
+++ b/lib/WebGUI/Asset/File/ZipArchive.pm
@@ -18,9 +18,9 @@ use strict;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::File';
-aspect assetName => ['assetName', 'Asset_ZipArchive'];
-aspect tableName => 'ZipArchiveAsset';
-aspect icon      => 'ziparchive.gif';
+define assetName => ['assetName', 'Asset_ZipArchive'];
+define tableName => 'ZipArchiveAsset';
+define icon      => 'ziparchive.gif';
 property showPage => (
             tab          => "properties",
             label        => ['show page', 'Asset_ZipArchive'],
diff --git a/lib/WebGUI/Asset/MapPoint.pm b/lib/WebGUI/Asset/MapPoint.pm
index 25237aaf7..c316f2b0c 100644
--- a/lib/WebGUI/Asset/MapPoint.pm
+++ b/lib/WebGUI/Asset/MapPoint.pm
@@ -18,9 +18,9 @@ use strict;
 use Tie::IxHash;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
-aspect assetName         => ['assetName', 'Asset_MapPoint'];
-aspect icon              => 'MapPoint.gif';
-aspect tableName         => 'MapPoint';
+define assetName         => ['assetName', 'Asset_MapPoint'];
+define icon              => 'MapPoint.gif';
+define tableName         => 'MapPoint';
 property latitude => (
             tab         => "properties",
             fieldType   => "float",
diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm
index 2b5989793..9910f2847 100644
--- a/lib/WebGUI/Asset/MatrixListing.pm
+++ b/lib/WebGUI/Asset/MatrixListing.pm
@@ -19,8 +19,8 @@ use Tie::IxHash;
 #use base qw(WebGUI::AssetAspect::Comments WebGUI::Asset);
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
-aspect assetName => ['assetName', 'Asset_MatrixListing'];
-aspect tableName => 'MatrixListing';
+define assetName => ['assetName', 'Asset_MatrixListing'];
+define tableName => 'MatrixListing';
 property screenshots => (
             tab             => "properties",
             fieldType       => "image",
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 007f91188..757f4182b 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -14,9 +14,9 @@ use strict;
 use Tie::CPHash;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
-aspect assetName => ['assetName', 'Asset_Post'];
-aspect icon      => 'post.gif';
-aspect tableName => 'Post';
+define assetName => ['assetName', 'Asset_Post'];
+define icon      => 'post.gif';
+define tableName => 'Post';
 property storageId => (
             fieldType         => "image",
             default           => '',
diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm
index 2065115fa..b2bc4f618 100644
--- a/lib/WebGUI/Asset/Post/Thread.pm
+++ b/lib/WebGUI/Asset/Post/Thread.pm
@@ -13,9 +13,9 @@ package WebGUI::Asset::Post::Thread;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Post';
-aspect assetName => ['assetName', 'Asset_Thread'];
-aspect icon      => 'thread.gif';
-aspect tableName => 'Thread';
+define assetName => ['assetName', 'Asset_Thread'];
+define icon      => 'thread.gif';
+define tableName => 'Thread';
 property subscriptionGroupId => (
                 noFormPost  => 1,
                 fieldType   => "hidden",
diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm
index 535ba8265..71b21755c 100644
--- a/lib/WebGUI/Asset/Redirect.pm
+++ b/lib/WebGUI/Asset/Redirect.pm
@@ -19,10 +19,10 @@ use WebGUI::Macro;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
-aspect assetName => ['assetName', 'Asset_Redirect'];
-aspect uiLevel   => 9;
-aspect icon      => 'redirect.gif';
-aspect tableName => 'redirect';
+define assetName => ['assetName', 'Asset_Redirect'];
+define uiLevel   => 9;
+define icon      => 'redirect.gif';
+define tableName => 'redirect';
 property redirectUrl => (
                 tab          => "properties",
                 label        => ['redirect url', 'Asset_Redirect'],
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index 56dc4f665..b205b836c 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -22,10 +22,10 @@ use JSON;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
-aspect assetName   => ['assetName', 'Asset_RichEdit'];
-aspect icon        => 'richEdit.gif';
-aspect uiLevel     => 5;
-aspect tableName   => 'RichEdit';
+define assetName   => ['assetName', 'Asset_RichEdit'];
+define icon        => 'richEdit.gif';
+define uiLevel     => 5;
+define tableName   => 'RichEdit';
 property disableRichEditor => (
                 fieldType       => 'yesNo',
                 default         => 0,
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index a90194347..a6a332ebb 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -16,9 +16,9 @@ use Tie::IxHash;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
 
-aspect assetName => ['assetName', 'Asset_Shortcut'];
-aspect icon      => 'shortcut.gif';
-aspect tableName => 'Shortcut';
+define assetName => ['assetName', 'Asset_Shortcut'];
+define icon      => 'shortcut.gif';
+define tableName => 'Shortcut';
 
 property  shortcutToAssetId => (
               noFormPost => 1,
diff --git a/lib/WebGUI/Asset/Sku.pm b/lib/WebGUI/Asset/Sku.pm
index 7bd35f27e..8bb9c1e1a 100644
--- a/lib/WebGUI/Asset/Sku.pm
+++ b/lib/WebGUI/Asset/Sku.pm
@@ -23,9 +23,9 @@ use WebGUI::Inbox;
 use WebGUI::Shop::Cart;
 use JSON qw{ from_json to_json };
 
-aspect assetName => ['assetName', 'Asset_Sku'];
-aspect icon      => 'Sku.gif';
-aspect tableName => 'sku';
+define assetName => ['assetName', 'Asset_Sku'];
+define icon      => 'Sku.gif';
+define tableName => 'sku';
 
 property description => (
             tab             => "properties",
diff --git a/lib/WebGUI/Asset/Sku/Ad.pm b/lib/WebGUI/Asset/Sku/Ad.pm
index ec894513d..752bed9e5 100644
--- a/lib/WebGUI/Asset/Sku/Ad.pm
+++ b/lib/WebGUI/Asset/Sku/Ad.pm
@@ -18,9 +18,9 @@ use strict;
 use Tie::IxHash;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName           => ['assetName', 'Asset_WikiMaster'];
-aspect icon                => 'adsku.gif';
-aspect tableName           => 'AdSku';
+define assetName           => ['assetName', 'Asset_WikiMaster'];
+define icon                => 'adsku.gif';
+define tableName           => 'AdSku';
 
 property purchaseTemplate => (
             tab             => "display",
diff --git a/lib/WebGUI/Asset/Sku/Donation.pm b/lib/WebGUI/Asset/Sku/Donation.pm
index 0bda495ef..3a5c256c6 100644
--- a/lib/WebGUI/Asset/Sku/Donation.pm
+++ b/lib/WebGUI/Asset/Sku/Donation.pm
@@ -19,9 +19,9 @@ use Tie::IxHash;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName           => ['assetName', 'Asset_Donation'];
-aspect icon                => 'Donation.gif';
-aspect tableName           => 'donation';
+define assetName           => ['assetName', 'Asset_Donation'];
+define icon                => 'Donation.gif';
+define tableName           => 'donation';
 property templateId => (
             tab             => "display",
             fieldType       => "template",
diff --git a/lib/WebGUI/Asset/Sku/EMSBadge.pm b/lib/WebGUI/Asset/Sku/EMSBadge.pm
index 981c8336a..f1f2d30ca 100644
--- a/lib/WebGUI/Asset/Sku/EMSBadge.pm
+++ b/lib/WebGUI/Asset/Sku/EMSBadge.pm
@@ -17,9 +17,9 @@ package WebGUI::Asset::Sku::EMSBadge;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName           => ['ems badge', 'Asset_EMSBadge'];
-aspect icon                => 'EMSBadge.gif';
-aspect tableName           => 'EMSBadge';
+define assetName           => ['ems badge', 'Asset_EMSBadge'];
+define icon                => 'EMSBadge.gif';
+define tableName           => 'EMSBadge';
 property price => (
             tab             => "shop",
             fieldType       => "float",
diff --git a/lib/WebGUI/Asset/Sku/EMSRibbon.pm b/lib/WebGUI/Asset/Sku/EMSRibbon.pm
index 94cf3681f..d91a4d8fa 100644
--- a/lib/WebGUI/Asset/Sku/EMSRibbon.pm
+++ b/lib/WebGUI/Asset/Sku/EMSRibbon.pm
@@ -17,9 +17,9 @@ package WebGUI::Asset::Sku::EMSRibbon;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName           => ['ems ribbon', 'Asset_EMSRibbon'];
-aspect icon                => 'EMSRibbon.gif';
-aspect tableName           => 'EMSRibbon';
+define assetName           => ['ems ribbon', 'Asset_EMSRibbon'];
+define icon                => 'EMSRibbon.gif';
+define tableName           => 'EMSRibbon';
 property price => (
             tab             => "shop",
             fieldType       => "float",
diff --git a/lib/WebGUI/Asset/Sku/EMSTicket.pm b/lib/WebGUI/Asset/Sku/EMSTicket.pm
index aaa7098de..814a2e396 100644
--- a/lib/WebGUI/Asset/Sku/EMSTicket.pm
+++ b/lib/WebGUI/Asset/Sku/EMSTicket.pm
@@ -17,9 +17,9 @@ package WebGUI::Asset::Sku::EMSTicket;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName           => ['ems ticket', 'Asset_EMSTicket'];
-aspect icon                => 'EMSTicket.gif';
-aspect tableName           => 'EMSTicket';
+define assetName           => ['ems ticket', 'Asset_EMSTicket'];
+define icon                => 'EMSTicket.gif';
+define tableName           => 'EMSTicket';
 property price => (
             tab             => "shop",
             fieldType       => "float",
diff --git a/lib/WebGUI/Asset/Sku/EMSToken.pm b/lib/WebGUI/Asset/Sku/EMSToken.pm
index 82ce21b64..3df13ee60 100644
--- a/lib/WebGUI/Asset/Sku/EMSToken.pm
+++ b/lib/WebGUI/Asset/Sku/EMSToken.pm
@@ -17,9 +17,9 @@ package WebGUI::Asset::Sku::EMSToken;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName           => ['ems token', 'Asset_EMSToken'];
-aspect icon                => 'EMSToken.gif';
-aspect tableName           => 'EMSToken';
+define assetName           => ['ems token', 'Asset_EMSToken'];
+define icon                => 'EMSToken.gif';
+define tableName           => 'EMSToken';
 property price => (
             tab             => "shop",
             fieldType       => "float",
diff --git a/lib/WebGUI/Asset/Sku/FlatDiscount.pm b/lib/WebGUI/Asset/Sku/FlatDiscount.pm
index 90a9c4d97..267f9552d 100644
--- a/lib/WebGUI/Asset/Sku/FlatDiscount.pm
+++ b/lib/WebGUI/Asset/Sku/FlatDiscount.pm
@@ -18,9 +18,9 @@ use strict;
 use Tie::IxHash;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName           => ['assetName', 'Asset_FlatDiscount'];
-aspect icon                => 'FlatDiscount.gif';
-aspect tableName           => 'FlatDiscount';
+define assetName           => ['assetName', 'Asset_FlatDiscount'];
+define icon                => 'FlatDiscount.gif';
+define tableName           => 'FlatDiscount';
 property templateId => (
             tab             => "display",
             fieldType       => "template",
diff --git a/lib/WebGUI/Asset/Sku/Product.pm b/lib/WebGUI/Asset/Sku/Product.pm
index 71c5e89bb..37b06c575 100644
--- a/lib/WebGUI/Asset/Sku/Product.pm
+++ b/lib/WebGUI/Asset/Sku/Product.pm
@@ -22,9 +22,9 @@ use JSON;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
 
-aspect assetName  => ['assetName', 'Asset_Product'];
-aspect icon       => 'product.gif';
-aspect tableName  => 'Product';
+define assetName  => ['assetName', 'Asset_Product'];
+define icon       => 'product.gif';
+define tableName  => 'Product';
 
 property cacheTimeout => (
             tab          => "display",
diff --git a/lib/WebGUI/Asset/Sku/Subscription.pm b/lib/WebGUI/Asset/Sku/Subscription.pm
index 0708c4230..9b3f089cb 100644
--- a/lib/WebGUI/Asset/Sku/Subscription.pm
+++ b/lib/WebGUI/Asset/Sku/Subscription.pm
@@ -18,9 +18,9 @@ use strict;
 use Tie::IxHash;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName           => ['assetName', 'Asset_Subscription'];
-aspect icon                => 'subscription.gif';
-aspect tableName           => 'Subscription';
+define assetName           => ['assetName', 'Asset_Subscription'];
+define icon                => 'subscription.gif';
+define tableName           => 'Subscription';
 property templateId => (
             tab             => "display",
             fieldType       => "template",
diff --git a/lib/WebGUI/Asset/Sku/ThingyRecord.pm b/lib/WebGUI/Asset/Sku/ThingyRecord.pm
index dd4d2508c..195d55d34 100644
--- a/lib/WebGUI/Asset/Sku/ThingyRecord.pm
+++ b/lib/WebGUI/Asset/Sku/ThingyRecord.pm
@@ -18,9 +18,9 @@ use strict;
 use Tie::IxHash;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Sku';
-aspect assetName         => ['assetName', 'Asset_ThingyRecord'];
-aspect icon              => 'thingyRecord.gif';
-aspect tableName         => 'ThingyRecord';
+define assetName         => ['assetName', 'Asset_ThingyRecord'];
+define icon              => 'thingyRecord.gif';
+define tableName         => 'ThingyRecord';
 property templateIdView => (
             tab       => "display",
             fieldType => "template",
diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm
index 4ad1bc288..6f3fe86a2 100644
--- a/lib/WebGUI/Asset/Snippet.pm
+++ b/lib/WebGUI/Asset/Snippet.pm
@@ -23,10 +23,10 @@ use HTML::Packer;
 use JavaScript::Packer;
 use CSS::Packer;
 
-aspect assetName  => ['assetName','Asset_Snippet'];
-aspect uiLevel    =>  5;
-aspect icon       => 'snippet.gif';
-aspect tableName  => 'snippet';
+define assetName  => ['assetName','Asset_Snippet'];
+define uiLevel    =>  5;
+define icon       => 'snippet.gif';
+define tableName  => 'snippet';
 
 property snippet => (
     fieldType       => 'codearea',
diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm
index 8c8193b24..a29f75a05 100644
--- a/lib/WebGUI/Asset/Story.pm
+++ b/lib/WebGUI/Asset/Story.pm
@@ -17,9 +17,9 @@ package WebGUI::Asset::Story;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
-aspect assetName         => ['assetName', 'Asset_Story'];
-aspect icon              => 'story.gif';
-aspect tableName         => 'Story';
+define assetName         => ['assetName', 'Asset_Story'];
+define icon              => 'story.gif';
+define tableName         => 'Story';
 property headline => (
             fieldType    => 'text',  
             label        => ['headline', 'Asset_Story'],
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index a418ace2d..e76378200 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -19,9 +19,9 @@ use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
 
-aspect assetName   => ['assetName', 'Asset_Template'];
-aspect icon        => 'template.gif';
-aspect tableName   => 'template';
+define assetName   => ['assetName', 'Asset_Template'];
+define icon        => 'template.gif';
+define tableName   => 'template';
 
 property template => (
              fieldType       => 'codearea',
diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm
index 1dfc4cc49..30bb3d3da 100644
--- a/lib/WebGUI/Asset/Wobject.pm
+++ b/lib/WebGUI/Asset/Wobject.pm
@@ -25,8 +25,8 @@ use WebGUI::SQL;
 use WebGUI::Utility;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset';
-aspect tableName   => 'wobject';
-aspect assetName   => 'Wobject';
+define tableName   => 'wobject';
+define assetName   => 'Wobject';
 property description => (
             fieldType       => 'HTMLArea',
             default         => undef,
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index 282c7ed32..ccc089790 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -17,9 +17,9 @@ use WebGUI::Paginator;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_Article'];
-aspect icon      => 'article.gif';
-aspect tableName => 'Article';
+define assetName => ['assetName', 'Asset_Article'];
+define icon      => 'article.gif';
+define tableName => 'Article';
 property cacheTimeout => (
                 tab       => "display",
                 fieldType => "interval",
diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index 9ec8de37c..eabac2dee 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -16,9 +16,9 @@ use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
 
-aspect assetName   => ['assetName', 'Asset_Calendar'];
-aspect icon        => 'calendar.gif';
-aspect tableName   => 'Calendar';
+define assetName   => ['assetName', 'Asset_Calendar'];
+define icon        => 'calendar.gif';
+define tableName   => 'Calendar';
 property defaultView => (
             fieldType       => "SelectBox",
             default         => "month",
diff --git a/lib/WebGUI/Asset/Wobject/Carousel.pm b/lib/WebGUI/Asset/Wobject/Carousel.pm
index 0bec2c1d6..b634d5928 100644
--- a/lib/WebGUI/Asset/Wobject/Carousel.pm
+++ b/lib/WebGUI/Asset/Wobject/Carousel.pm
@@ -19,9 +19,9 @@ use WebGUI::International;
 use WebGUI::Utility;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => [ 'assetName', 'Asset_Carousel' ];
-aspect icon      => 'Carousel.png';
-aspect tableName => 'Carousel';
+define assetName => [ 'assetName', 'Asset_Carousel' ];
+define icon      => 'Carousel.png';
+define tableName => 'Carousel';
 property templateId => (
     fieldType  => "template",
     default    => 'CarouselTmpl0000000001',
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index 9371fb072..b74de51c5 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -13,9 +13,9 @@ package WebGUI::Asset::Wobject::Collaboration;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_Collaboration'];
-aspect icon      => 'collaboration.gif';
-aspect tableName => 'Collaboration';
+define assetName => ['assetName', 'Asset_Collaboration'];
+define icon      => 'collaboration.gif';
+define tableName => 'Collaboration';
 property visitorCacheTimeout => (
     tab       => "display",
     fieldType => "interval",
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm b/lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm
index b795ea304..338dea051 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm
@@ -13,9 +13,9 @@ package WebGUI::Asset::Wobject::Collaboration::Newsletter;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject::Collaboration';
-aspect assetName => ['assetName', 'Asset_Newsletter'];
-aspect icon      => 'newsletter.gif';
-aspect tableName => 'Newsletter';
+define assetName => ['assetName', 'Asset_Newsletter'];
+define icon      => 'newsletter.gif';
+define tableName => 'Newsletter';
 property newsletterHeader => (
     default   => undef,
     fieldType => "HTMLArea",
diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm
index b9dc58998..4f09f7713 100644
--- a/lib/WebGUI/Asset/Wobject/Dashboard.pm
+++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm
@@ -19,9 +19,9 @@ use WebGUI::Asset::Wobject;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => [ 'assetName', 'Asset_Dashboard' ];
-aspect icon      => 'dashboard.gif';
-aspect tableName => 'Dashboard';
+define assetName => [ 'assetName', 'Asset_Dashboard' ];
+define icon      => 'dashboard.gif';
+define tableName => 'Dashboard';
 property templateId => (
     fieldType => "template",
     default   => 'DashboardViewTmpl00001',
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 81b61c3e4..81b0b916d 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -28,10 +28,10 @@ use JSON ();
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
 
-aspect assetName           => ['assetName', 'Asset_DataForm'];
-aspect uiLevel             => 5;
-aspect tableName           => 'DataForm';
-aspect icon                => 'dataForm.gif';
+define assetName           => ['assetName', 'Asset_DataForm'];
+define uiLevel             => 5;
+define tableName           => 'DataForm';
+define icon                => 'dataForm.gif';
 property templateId => (
             fieldType       => 'template',
             default         => 'PBtmpl0000000000000141',
diff --git a/lib/WebGUI/Asset/Wobject/DataTable.pm b/lib/WebGUI/Asset/Wobject/DataTable.pm
index 593faf5bc..2063803af 100644
--- a/lib/WebGUI/Asset/Wobject/DataTable.pm
+++ b/lib/WebGUI/Asset/Wobject/DataTable.pm
@@ -15,9 +15,9 @@ $VERSION = "1.0.0";
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName         => ['assetName', 'Asset_EMSRibbon'];
-aspect icon              => 'DataTable.gif';
-aspect tableName         => 'DataTable';
+define assetName         => ['assetName', 'Asset_EMSRibbon'];
+define icon              => 'DataTable.gif';
+define tableName         => 'DataTable';
 property data => (
             fieldType    => 'DataTable',
             default      => undef,
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index d0b3ad96c..31b1d15a4 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -17,9 +17,9 @@ package WebGUI::Asset::Wobject::EventManagementSystem;
 use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_EventManagementSystem'];
-aspect icon      => 'ems.gif';
-aspect tableName => 'EventManagementSystem';
+define assetName => ['assetName', 'Asset_EventManagementSystem'];
+define icon      => 'ems.gif';
+define tableName => 'EventManagementSystem';
 property timezone => (
             fieldType        => 'TimeZone',
             default          => 'America/Chicago',
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 9abf7b6fb..6caca1341 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -18,10 +18,10 @@ use strict;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
 
-aspect assetName   => ["assetName", 'Asset_Folder'];
-aspect uiLevel     => 5;
-aspect icon        => 'folder.gif';
-aspect tableName   => 'Folder';
+define assetName   => ["assetName", 'Asset_Folder'];
+define uiLevel     => 5;
+define icon        => 'folder.gif';
+define tableName   => 'Folder';
 
 property visitorCacheTimeout => (
              tab             => "display",
diff --git a/lib/WebGUI/Asset/Wobject/Gallery.pm b/lib/WebGUI/Asset/Wobject/Gallery.pm
index 36731a359..374241434 100644
--- a/lib/WebGUI/Asset/Wobject/Gallery.pm
+++ b/lib/WebGUI/Asset/Wobject/Gallery.pm
@@ -15,9 +15,9 @@ use strict;
 #use base qw(WebGUI::AssetAspect::RssFeed WebGUI::Asset::Wobject);
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName           => ['assetName', 'Asset_Gallery'];
-aspect icon                => 'photoGallery.gif';
-aspect tableName           => 'Gallery',
+define assetName           => ['assetName', 'Asset_Gallery'];
+define icon                => 'photoGallery.gif';
+define tableName           => 'Gallery',
 property groupIdAddComment => (
             tab             => "security",
             fieldType       => "group",
diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
index f6ae132fc..ca851766f 100644
--- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
+++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
@@ -14,9 +14,9 @@ use strict;
 #use Class::C3;
 #use base qw(WebGUI::AssetAspect::RssFeed WebGUI::Asset::Wobject);
 use WebGUI::Definition::Asset;
-aspect assetName           => ['assetName', 'Asset_GalleryAlbum'];
-aspect icon                => 'photoAlbum.gif';
-aspect tableName           => 'GalleryAlbum';
+define assetName           => ['assetName', 'Asset_GalleryAlbum'];
+define icon                => 'photoAlbum.gif';
+define tableName           => 'GalleryAlbum';
 
 property allowComments => (  ##Note, there's no UI for this feature.  There's just the framework for it.
             noFormPost      => 1,
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index 3be01c33d..c0e5bc1c6 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -24,10 +24,10 @@ use Apache2::Upload;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_HttpProxy'];
-aspect uiLevel   => 5;
-aspect icon      => 'httpProxy.gif';
-aspect tableName => 'HttpProxy';
+define assetName => ['assetName', 'Asset_HttpProxy'];
+define uiLevel   => 5;
+define icon      => 'httpProxy.gif';
+define tableName => 'HttpProxy';
 property templateId => (
                 fieldType => "template",
                 default   => 'PBtmpl0000000000000033',
diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm
index a42ac0809..60eb3fc2e 100644
--- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm
@@ -9,9 +9,9 @@ use WebGUI::SQL;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect tableName => 'InOutBoard';
-aspect assetName => ['assetName', 'Asset_MapPoint'];
-aspect icon      => 'iob.gif';
+define tableName => 'InOutBoard';
+define assetName => ['assetName', 'Asset_MapPoint'];
+define icon      => 'iob.gif';
 property statusList => (
                 tab          => 'properties',
                 fieldType    => "textarea",
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 35889eefd..56ab42e27 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -19,9 +19,9 @@ use WebGUI::AdSpace;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
 
-aspect assetName => ["assetName", 'Asset_Layout'];
-aspect icon      => 'layout.gif';
-aspect tableName => 'Layout';
+define assetName => ["assetName", 'Asset_Layout'];
+define icon      => 'layout.gif';
+define tableName => 'Layout';
 
 property templateId => (
              fieldType    => "template",
diff --git a/lib/WebGUI/Asset/Wobject/Map.pm b/lib/WebGUI/Asset/Wobject/Map.pm
index ca9a93f03..0346a0b04 100644
--- a/lib/WebGUI/Asset/Wobject/Map.pm
+++ b/lib/WebGUI/Asset/Wobject/Map.pm
@@ -19,9 +19,9 @@ use WebGUI::Utility;
 use HTML::Entities qw(encode_entities);
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName         => ['assetName', 'Asset_Map'];
-aspect icon              => 'maps.png';
-aspect tableName         => 'Map';
+define assetName         => ['assetName', 'Asset_Map'];
+define icon              => 'maps.png';
+define tableName         => 'Map';
 property groupIdAddPoint => (
             tab         => "security",
             fieldType   => "group",
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 1c3a4f047..9d237769b 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -20,9 +20,9 @@ use WebGUI::Utility;
 use WebGUI::Definition::Asset;
 use feature ":5.10";
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_Matrix'];
-aspect icon      => 'matrix.gif';
-aspect tableName => 'Matrix';
+define assetName => ['assetName', 'Asset_Matrix'];
+define icon      => 'matrix.gif';
+define tableName => 'Matrix';
 property templateId => (
             fieldType       => "template",  
             default         => 'matrixtmpl000000000001',
diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
index aa9ee703b..75c9a6ee8 100644
--- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
@@ -18,9 +18,9 @@ use WebGUI::SQL;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_MessageBoard'];
-aspect icon      => 'messageBoard.gif';
-aspect tableName => 'MessageBoard';
+define assetName => ['assetName', 'Asset_MessageBoard'];
+define icon      => 'messageBoard.gif';
+define tableName => 'MessageBoard';
 property templateId => (
                 tab         => "display",
                 fieldType   => "template",
diff --git a/lib/WebGUI/Asset/Wobject/MultiSearch.pm b/lib/WebGUI/Asset/Wobject/MultiSearch.pm
index 5e99c9f19..eb385030f 100644
--- a/lib/WebGUI/Asset/Wobject/MultiSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/MultiSearch.pm
@@ -29,9 +29,9 @@ use WebGUI::Utility;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect tableName => 'MultiSearch';
-aspect assetName => ['assetName', 'Asset_MultiSearch'];
-aspect icon      => 'multiSearch.gif';
+define tableName => 'MultiSearch';
+define assetName => ['assetName', 'Asset_MultiSearch'];
+define icon      => 'multiSearch.gif';
 property cacheTimeout => (
             tab           => "display",
             fieldType     => "interval",
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index b478930d1..e12ee83da 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -20,9 +20,9 @@ use WebGUI::Utility;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ["assetName", 'Asset_Navigation'];
-aspect icon      => 'navigation.gif';
-aspect tableName => 'Navigation';
+define assetName => ["assetName", 'Asset_Navigation'];
+define icon      => 'navigation.gif';
+define tableName => 'Navigation';
 
 property    templateId => (
                 label        => ['1096', 'Asset_Navigation'],
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 11cfbe8ac..0df144543 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -25,9 +25,9 @@ use JSON;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_Poll'];
-aspect tableName => 'Poll';
-aspect icon      => 'poll.gif';
+define assetName => ['assetName', 'Asset_Poll'];
+define tableName => 'Poll';
+define icon      => 'poll.gif';
 property templateId => (
                 tab          => 'display',
                 fieldType    => "template",
diff --git a/lib/WebGUI/Asset/Wobject/ProjectManager.pm b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
index e1269564f..eda743115 100644
--- a/lib/WebGUI/Asset/Wobject/ProjectManager.pm
+++ b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
@@ -21,9 +21,9 @@ use WebGUI::HTML;
 use POSIX qw(ceil floor);
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_ProjectManager'];
-aspect icon      => 'projManagement.gif';
-aspect tableName => 'PM_wobject';
+define assetName => ['assetName', 'Asset_ProjectManager'];
+define icon      => 'projManagement.gif';
+define tableName => 'PM_wobject';
 property projectDashboardTemplateId => (
             fieldType   => "template",  
             default     => 'ProjectManagerTMPL0001',
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index ccf200b20..b96aa4900 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -22,10 +22,10 @@ use WebGUI::Text qw(:csv);
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_SQLReport'];
-aspect uiLevel   => 5;
-aspect icon      => 'sqlReport.gif';
-aspect tableName => 'SQLReport';
+define assetName => ['assetName', 'Asset_SQLReport'];
+define uiLevel   => 5;
+define icon      => 'sqlReport.gif';
+define tableName => 'SQLReport';
 property templateId => (
             fieldType   => "template",
             default     => 'PBtmpl0000000000000059',
diff --git a/lib/WebGUI/Asset/Wobject/Search.pm b/lib/WebGUI/Asset/Wobject/Search.pm
index 3dcf2c5c2..075370a14 100644
--- a/lib/WebGUI/Asset/Wobject/Search.pm
+++ b/lib/WebGUI/Asset/Wobject/Search.pm
@@ -13,9 +13,9 @@ package WebGUI::Asset::Wobject::Search;
 use strict;
 use WebGUI::Definition::Asset;
 extends "WebGUI::Asset::Wobject";
-aspect assetName => ['assetName', 'Asset_Search'];
-aspect icon      => 'search.gif';
-aspect tableName => 'search';
+define assetName => ['assetName', 'Asset_Search'];
+define icon      => 'search.gif';
+define tableName => 'search';
 property templateId => (
                 fieldType       => "template",
                 default         => 'PBtmpl0000000000000200',    
diff --git a/lib/WebGUI/Asset/Wobject/Shelf.pm b/lib/WebGUI/Asset/Wobject/Shelf.pm
index 89b42bd68..4716329bc 100644
--- a/lib/WebGUI/Asset/Wobject/Shelf.pm
+++ b/lib/WebGUI/Asset/Wobject/Shelf.pm
@@ -21,9 +21,9 @@ use WebGUI::Storage;
 use WebGUI::Exception::Shop;
 use WebGUI::Asset::Sku::Product;
 
-aspect assetName  => ['assetName', 'Asset_Shelf'];
-aspect icon       => 'Shelf.gif';
-aspect tableName  => 'Shelf';
+define assetName  => ['assetName', 'Asset_Shelf'];
+define icon       => 'Shelf.gif';
+define tableName  => 'Shelf';
 
 property templateId => (
             fieldType        => "template",  
diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm
index f2e61bdad..82e2fc618 100644
--- a/lib/WebGUI/Asset/Wobject/StockData.pm
+++ b/lib/WebGUI/Asset/Wobject/StockData.pm
@@ -18,9 +18,9 @@ use Finance::Quote;
 
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect tableName => 'StockData';
-aspect icon      => 'stockData.gif';
-aspect assetName => ["assetName", 'Asset_StockData'];
+define tableName => 'StockData';
+define icon      => 'stockData.gif';
+define assetName => ["assetName", 'Asset_StockData'];
 property templateId => (
             fieldType   => "template",
             default     => 'StockDataTMPL000000001',
diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm
index b8cff800e..df0c607c8 100644
--- a/lib/WebGUI/Asset/Wobject/StoryArchive.pm
+++ b/lib/WebGUI/Asset/Wobject/StoryArchive.pm
@@ -18,9 +18,9 @@ use strict;
 #use base qw/WebGUI::AssetAspect::RssFeed WebGUI::Asset::Wobject/;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_StoryArchive'];
-aspect icon      => 'storyarchive.gif';
-aspect tableName => 'StoryArchive';
+define assetName => ['assetName', 'Asset_StoryArchive'];
+define icon      => 'storyarchive.gif';
+define tableName => 'StoryArchive';
 property storiesPerPage => (
             tab          => 'display',  
             fieldType    => 'integer',  
diff --git a/lib/WebGUI/Asset/Wobject/StoryTopic.pm b/lib/WebGUI/Asset/Wobject/StoryTopic.pm
index a68053d82..5986dcaa8 100644
--- a/lib/WebGUI/Asset/Wobject/StoryTopic.pm
+++ b/lib/WebGUI/Asset/Wobject/StoryTopic.pm
@@ -17,9 +17,9 @@ use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
 #use Class::C3;
 #use base qw/WebGUI::AssetAspect::RssFeed WebGUI::Asset::Wobject/;
-aspect assetName => ['assetName', 'Asset_StoryTopic'];
-aspect icon      => 'storytopic.gif';
-aspect tableName => 'StoryTopic';
+define assetName => ['assetName', 'Asset_StoryTopic'];
+define icon      => 'storytopic.gif';
+define tableName => 'StoryTopic';
 property storiesPer => (
             tab          => 'display',  
             fieldType    => 'integer',  
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 58f8eab1d..f3c8243e1 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -18,9 +18,9 @@ use WebGUI::Form::File;
 use WebGUI::Utility;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName   => ['assetName', 'Asset_Survey'];
-aspect icon        => 'survey.gif';
-aspect tableName   => 'Survey';
+define assetName   => ['assetName', 'Asset_Survey'];
+define icon        => 'survey.gif';
+define tableName   => 'Survey';
 property exitURL => (
             fieldType    => 'text',
             default      => undef,
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index 18849971d..c649462ba 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -20,10 +20,10 @@ use WebGUI::International;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
 
-aspect assetName => ['assetName','Asset_SyndicatedContent'];
-aspect uiLevel   => 6;
-aspect icon      => 'syndicatedContent.gif';
-aspect tableName => 'SyndicatedContent';
+define assetName => ['assetName','Asset_SyndicatedContent'];
+define uiLevel   => 6;
+define icon      => 'syndicatedContent.gif';
+define tableName => 'SyndicatedContent';
 property cacheTimeout => (
                 tab          => "display",
                 fieldType    => "interval",
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 0c7dbf00b..eb37f06b1 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -21,9 +21,9 @@ use WebGUI::DateTime;
 use WebGUI::Definition::Asset;
 
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_Thingy'];
-aspect icon      => 'thingy.gif';
-aspect tableName => 'Thingy';
+define assetName => ['assetName', 'Asset_Thingy'];
+define icon      => 'thingy.gif';
+define tableName => 'Thingy';
 property templateId => (
             fieldType   => "template",  
             default     => 'ThingyTmpl000000000001',
diff --git a/lib/WebGUI/Asset/Wobject/TimeTracking.pm b/lib/WebGUI/Asset/Wobject/TimeTracking.pm
index 456fc477f..eb1d3816f 100644
--- a/lib/WebGUI/Asset/Wobject/TimeTracking.pm
+++ b/lib/WebGUI/Asset/Wobject/TimeTracking.pm
@@ -20,9 +20,9 @@ use WebGUI::Utility;
 use POSIX qw(ceil floor);
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_TimeTracking'];
-aspect icon      => 'timetrack.gif';
-aspect tableName => 'TT_wobject';
+define assetName => ['assetName', 'Asset_TimeTracking'];
+define icon      => 'timetrack.gif';
+define tableName => 'TT_wobject';
 property userViewTemplateId => (
 			fieldType   => "template",  
 			default     => 'TimeTrackingTMPL000001',
diff --git a/lib/WebGUI/Asset/Wobject/UserList.pm b/lib/WebGUI/Asset/Wobject/UserList.pm
index 52e138155..7c7cc4fd6 100644
--- a/lib/WebGUI/Asset/Wobject/UserList.pm
+++ b/lib/WebGUI/Asset/Wobject/UserList.pm
@@ -24,9 +24,9 @@ use WebGUI::Form::File;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
 
-aspect assetName => ['assetName', 'Asset_UserList'];
-aspect icon      => 'userlist.gif';
-aspect tableName => 'UserList';
+define assetName => ['assetName', 'Asset_UserList'];
+define icon      => 'userlist.gif';
+define tableName => 'UserList';
 property templateId => (
             fieldType   => "template",  
             default     => 'UserListTmpl0000000001',
diff --git a/lib/WebGUI/Asset/Wobject/WeatherData.pm b/lib/WebGUI/Asset/Wobject/WeatherData.pm
index 5cdbe4a0f..4fd28d26d 100644
--- a/lib/WebGUI/Asset/Wobject/WeatherData.pm
+++ b/lib/WebGUI/Asset/Wobject/WeatherData.pm
@@ -30,9 +30,9 @@ BEGIN {
 use WebGUI::International;
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect tableName => 'WeatherData';
-aspect assetName => ["assetName", 'Asset_WeatherData'];
-aspect icon      => 'weatherData.gif';
+define tableName => 'WeatherData';
+define assetName => ["assetName", 'Asset_WeatherData'];
+define icon      => 'weatherData.gif';
 property partnerId => (
             fieldType   => "text",
             tab         => "properties",
diff --git a/lib/WebGUI/Asset/Wobject/WikiMaster.pm b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
index 07c977cca..654ed85a5 100644
--- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm
+++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
@@ -18,9 +18,9 @@ package WebGUI::Asset::Wobject::WikiMaster;
 #);
 use WebGUI::Definition::Asset;
 extends 'WebGUI::Asset::Wobject';
-aspect assetName => ['assetName', 'Asset_RichEdit'];
-aspect icon      => 'wikiMaster.gif';
-aspect tableName => 'WikiMaster';
+define assetName => ['assetName', 'Asset_RichEdit'];
+define icon      => 'wikiMaster.gif';
+define tableName => 'WikiMaster';
 
 property groupToEditPages => (
             fieldType => 'group',
diff --git a/lib/WebGUI/Definition.pm b/lib/WebGUI/Definition.pm
index e877a77cd..11b90a4fe 100644
--- a/lib/WebGUI/Definition.pm
+++ b/lib/WebGUI/Definition.pm
@@ -47,7 +47,7 @@ These methods are available from this class:
 
 my ($import, $unimport, $init_meta) = Moose::Exporter->build_import_methods(
     install         => [ 'unimport' ],
-    with_meta       => [ 'property', 'aspect' ],
+    with_meta       => [ 'property', 'define' ],
     also            => 'Moose',
 );
 
@@ -89,15 +89,15 @@ sub init_meta {
 
 #-------------------------------------------------------------------
 
-=head2 aspect ( )
+=head2 define ( )
 
-An aspect of the definition is typically static data which is never processed from a form
-or persisted to the database.  In an Asset-style definition, an aspect would
-be the table name, the asset's name, or the path to the asset's icon.
+Defines a piece static data for the class which is never processed from a form
+or persisted to the database.  In an Asset-style definition, this would be
+used for the table name, the asset's name, or the path to the asset's icon.
 
 =cut
 
-sub aspect {
+sub define {
     my ($meta, $name, $value) = @_;
     if ($meta->can($name)) {
         $meta->$name($value);
diff --git a/lib/WebGUI/Definition/Asset.pm b/lib/WebGUI/Definition/Asset.pm
index dc8b543fb..5530394cf 100644
--- a/lib/WebGUI/Definition/Asset.pm
+++ b/lib/WebGUI/Definition/Asset.pm
@@ -72,7 +72,7 @@ sub init_meta {
 
 =head2 property ( $name, %options )
 
-Extends WebGUI::Definition::property to copy the tableName aspect from the
+Extends WebGUI::Definition::property to copy the tableName from the
 meta class into the options for each property.
 
 =head3 $name
diff --git a/t/Definition.t b/t/Definition.t
index b697a1d29..69ee1853a 100644
--- a/t/Definition.t
+++ b/t/Definition.t
@@ -27,7 +27,7 @@ my $called_getProperties;
     package WGT::Class;
     use WebGUI::Definition;
 
-    aspect 'aspect1' => 'aspect1 value';
+    define 'define1' => 'define1 value';
     property 'property1' => (
         arbitrary_key => 'arbitrary_value',
         label         => 'property1',
@@ -37,10 +37,10 @@ my $called_getProperties;
         label         => 'property2',
     );
 
-    # aspects create methods
-    ::can_ok +__PACKAGE__, 'aspect1';
+    # define creates methods
+    ::can_ok +__PACKAGE__, 'define1';
 
-    # propeties create methods
+    # properties create methods
     ::can_ok +__PACKAGE__, 'property1';
 
     # role applied
@@ -60,7 +60,7 @@ my $called_getProperties;
     package WGT::Class2;
     use WebGUI::Definition;
 
-    aspect 'aspect1' => 'aspect1 value';
+    define 'define1' => 'define1 value';
     property  'property3' => ( label => 'label' );
     property  'property1' => ( label => 'label' );
     property  'property2' => ( label => 'label' );
@@ -102,7 +102,7 @@ my $called_getProperties;
     package WGT::Class3;
     use WebGUI::Definition;
 
-    aspect 'aspect1' => 'aspect1 value';
+    define 'define1' => 'define1 value';
     property  'property1' => (
         label     => ['webgui', 'WebGUI'],
         hoverHelp => ['webgui help %s', 'WebGUI', 'extra'],
@@ -145,7 +145,7 @@ my $called_getProperties;
     use WebGUI::Definition;
     extends 'WGT::Class3';
 
-    aspect 'aspect41' => 'aspect41 value';
+    define 'define41' => 'define41 value';
     property  'property41' => (
         label   => ['webgui', 'WebGUI'],
     );
@@ -159,7 +159,7 @@ my $called_getProperties;
     ::cmp_bag (
         [WGT::Class3->meta->get_all_attributes_list],
         [qw/ property1 session /],
-        'get_all_aspects_list returns all aspects in all metaclasses for the class'
+        'get_all_attributes_list returns all attributes in all metaclasses for the class'
     );
 
     ::cmp_bag (
diff --git a/t/Definition/Asset.t b/t/Definition/Asset.t
index cbb31fcb9..abf0240ee 100644
--- a/t/Definition/Asset.t
+++ b/t/Definition/Asset.t
@@ -24,7 +24,7 @@ use WebGUI::Test;
     package WGT::Class::Atset;
     use WebGUI::Definition::Asset;
 
-    aspect tableName => 'asset';
+    define tableName => 'asset';
     ::dies_ok  { property 'property1' => (); } 'must have a fieldType';
     ::dies_ok  { property 'property1' => (fieldType => 'text'); } 'must pass either a label or noFormPost flag';
     ::lives_ok { property 'property1' => (
@@ -44,7 +44,7 @@ use WebGUI::Test;
     package WGT::Class::Asset;
     use WebGUI::Definition::Asset;
 
-    aspect tableName => 'asset';
+    define tableName => 'asset';
     property 'property2' => (
         fieldType => 'text',
         label     => 'property2',
@@ -138,7 +138,7 @@ use WebGUI::Test;
     package WGT::Class::AlsoAsset;
     use WebGUI::Definition::Asset;
 
-    aspect tableName => 'asset';
+    define tableName => 'asset';
     property 'property1' => (
         fieldType => 'text',
         label     => 'property1',
@@ -156,7 +156,7 @@ use WebGUI::Test;
     use WebGUI::Definition::Asset;
     extends 'WGT::Class::AlsoAsset';
 
-    aspect tableName => 'snippet';
+    define tableName => 'snippet';
     property 'property10' => (
         fieldType => 'text',
         label     => 'property10',
@@ -211,7 +211,7 @@ use WebGUI::Test;
     use WebGUI::Definition::Asset;
     extends 'WGT::Class::AlsoAsset';
 
-    aspect tableName => 'snippet';
+    define tableName => 'snippet';
     property 'property10' => (
         fieldType => 'text',
         label     => 'property10',
@@ -237,7 +237,7 @@ use WebGUI::Test;
     use WebGUI::Definition::Asset;
     extends 'WGT::Class::AlsoAsset';
 
-    aspect tableName => 'tertius';
+    define tableName => 'tertius';
     property 'defaulted' => (
         fieldType => 'text',
         label     => 'defaulted',