diff --git a/code/Admin/type.properties b/code/Admin/Admin.properties
similarity index 100%
rename from code/Admin/type.properties
rename to code/Admin/Admin.properties
diff --git a/code/Archive/type.properties b/code/Archive/Archive.properties
similarity index 100%
rename from code/Archive/type.properties
rename to code/Archive/Archive.properties
diff --git a/code/Choice/type.properties b/code/Choice/Choice.properties
similarity index 100%
rename from code/Choice/type.properties
rename to code/Choice/Choice.properties
diff --git a/code/Comment/type.properties b/code/Comment/Comment.properties
similarity index 100%
rename from code/Comment/type.properties
rename to code/Comment/Comment.properties
diff --git a/code/File/type.properties b/code/File/File.properties
similarity index 100%
rename from code/File/type.properties
rename to code/File/File.properties
diff --git a/code/Files/type.properties b/code/Files/Files.properties
similarity index 87%
rename from code/Files/type.properties
rename to code/Files/Files.properties
index 0b030f85..f8a329c6 100644
--- a/code/Files/type.properties
+++ b/code/Files/Files.properties
@@ -16,9 +16,9 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ##
-## $Revision$
-## $LastChangedBy$
-## $LastChangedDate$
+## $Revision:3339 $
+## $LastChangedBy:piefke3000 $
+## $LastChangedDate:2007-09-25 00:00:46 +0200 (Tue, 25 Sep 2007) $
 ## $URL$
 ##
 
diff --git a/code/HopObject/HopObject.js b/code/HopObject/HopObject.js
index c1296499..be640970 100644
--- a/code/HopObject/HopObject.js
+++ b/code/HopObject/HopObject.js
@@ -87,7 +87,7 @@ HopObject.prototype.delete_action = function() {
 
    res.data.action = this.href(req.action);
    res.data.title = gettext("Confirm deletion of " + this);
-   res.data.body = this.renderSkinAsString("delete", {
+   res.data.body = this.renderSkinAsString("HopObject#delete", {
       text: gettext('You are about to delete {0}.', this)
    });
    res.handlers.site.renderSkin("page");
diff --git a/code/HopObject/delete.skin b/code/HopObject/HopObject.skin
similarity index 97%
rename from code/HopObject/delete.skin
rename to code/HopObject/HopObject.skin
index dcbe5dd2..66608233 100644
--- a/code/HopObject/delete.skin
+++ b/code/HopObject/HopObject.skin
@@ -1,3 +1,4 @@
+<% #delete %>
 <form action="<% response.action %>" method="post">
 <p class="storyTitle">Warning!</p>
 <p><% param.text %></p>
diff --git a/code/Image/type.properties b/code/Image/Image.properties
similarity index 100%
rename from code/Image/type.properties
rename to code/Image/Image.properties
diff --git a/code/Images/type.properties b/code/Images/Images.properties
similarity index 93%
rename from code/Images/type.properties
rename to code/Images/Images.properties
index 27ee1ab7..8df8698e 100644
--- a/code/Images/type.properties
+++ b/code/Images/Images.properties
@@ -16,9 +16,9 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ##
-## $Revision$
-## $LastChangedBy$
-## $LastChangedDate$
+## $Revision:3338 $
+## $LastChangedBy:piefke3000 $
+## $LastChangedDate:2007-09-22 23:48:33 +0200 (Sat, 22 Sep 2007) $
 ## $URL$
 ##
 
diff --git a/code/Layout/type.properties b/code/Layout/Layout.properties
similarity index 100%
rename from code/Layout/type.properties
rename to code/Layout/Layout.properties
diff --git a/code/Layouts/type.properties b/code/Layouts/Layouts.properties
similarity index 89%
rename from code/Layouts/type.properties
rename to code/Layouts/Layouts.properties
index e8847c6e..fd463da7 100644
--- a/code/Layouts/type.properties
+++ b/code/Layouts/Layouts.properties
@@ -16,9 +16,9 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ##
-## $Revision$
-## $LastChangedBy$
-## $LastChangedDate$
+## $Revision:3337 $
+## $LastChangedBy:piefke3000 $
+## $LastChangedDate:2007-09-21 15:54:30 +0200 (Fri, 21 Sep 2007) $
 ## $URL$
 ##
 
diff --git a/code/LogEntry/type.properties b/code/LogEntry/LogEntry.properties
similarity index 100%
rename from code/LogEntry/type.properties
rename to code/LogEntry/LogEntry.properties
diff --git a/code/Members/type.properties b/code/Members/Members.properties
similarity index 92%
rename from code/Members/type.properties
rename to code/Members/Members.properties
index 3690804a..6560c8c3 100644
--- a/code/Members/type.properties
+++ b/code/Members/Members.properties
@@ -16,9 +16,9 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ##
-## $Revision$
-## $LastChangedBy$
-## $LastChangedDate$
+## $Revision:3329 $
+## $LastChangedBy:piefke3000 $
+## $LastChangedDate:2007-09-14 15:18:09 +0200 (Fri, 14 Sep 2007) $
 ## $URL$
 ##
 
diff --git a/code/Membership/type.properties b/code/Membership/Membership.properties
similarity index 100%
rename from code/Membership/type.properties
rename to code/Membership/Membership.properties
diff --git a/code/Poll/type.properties b/code/Poll/Poll.properties
similarity index 100%
rename from code/Poll/type.properties
rename to code/Poll/Poll.properties
diff --git a/code/Polls/type.properties b/code/Polls/Polls.properties
similarity index 88%
rename from code/Polls/type.properties
rename to code/Polls/Polls.properties
index c9448e34..12a2b628 100644
--- a/code/Polls/type.properties
+++ b/code/Polls/Polls.properties
@@ -16,9 +16,9 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ##
-## $Revision$
-## $LastChangedBy$
-## $LastChangedDate$
+## $Revision:3346 $
+## $LastChangedBy:piefke3000 $
+## $LastChangedDate:2007-10-04 20:48:35 +0200 (Thu, 04 Oct 2007) $
 ## $URL$
 ##
 
diff --git a/code/Root/type.properties b/code/Root/Root.properties
similarity index 91%
rename from code/Root/type.properties
rename to code/Root/Root.properties
index 0c94c932..2307bf12 100644
--- a/code/Root/type.properties
+++ b/code/Root/Root.properties
@@ -31,11 +31,11 @@ _parent =
 
 admin = mountpoint(Admin)
 members = mountpoint(Members)
-#layouts = mountpoint(RootLayoutMgr)
 
-blogger = mountpoint(BloggerApi)
-metaWeblog = mountpoint(MetaWeblogApi)
-mt = mountpoint(MtApi)
+## FIXME:
+#blogger = mountpoint(BloggerApi)
+#metaWeblog = mountpoint(MetaWeblogApi)
+#mt = mountpoint(MtApi)
 
 _children = collection(Site)
 _children.accessname = name
diff --git a/code/Site/type.properties b/code/Site/Site.properties
similarity index 100%
rename from code/Site/type.properties
rename to code/Site/Site.properties
diff --git a/code/Skin/type.properties b/code/Skin/Skin.properties
similarity index 100%
rename from code/Skin/type.properties
rename to code/Skin/Skin.properties
diff --git a/code/Skins/type.properties b/code/Skins/Skins.properties
similarity index 91%
rename from code/Skins/type.properties
rename to code/Skins/Skins.properties
index 5feaf20a..6303fc04 100644
--- a/code/Skins/type.properties
+++ b/code/Skins/Skins.properties
@@ -16,9 +16,9 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ##
-## $Revision$
-## $LastChangedBy$
-## $LastChangedDate$
+## $Revision:3337 $
+## $LastChangedBy:piefke3000 $
+## $LastChangedDate:2007-09-21 15:54:30 +0200 (Fri, 21 Sep 2007) $
 ## $URL$
 ##
 
diff --git a/code/Stories/type.properties b/code/Stories/Stories.properties
similarity index 100%
rename from code/Stories/type.properties
rename to code/Stories/Stories.properties
diff --git a/code/Story/type.properties b/code/Story/Story.properties
similarity index 100%
rename from code/Story/type.properties
rename to code/Story/Story.properties
diff --git a/code/Tag/type.properties b/code/Tag/Tag.properties
similarity index 100%
rename from code/Tag/type.properties
rename to code/Tag/Tag.properties
diff --git a/code/TagHub/type.properties b/code/TagHub/TagHub.properties
similarity index 100%
rename from code/TagHub/type.properties
rename to code/TagHub/TagHub.properties
diff --git a/code/Tags/type.properties b/code/Tags/Tags.properties
similarity index 100%
rename from code/Tags/type.properties
rename to code/Tags/Tags.properties
diff --git a/code/User/type.properties b/code/User/User.properties
similarity index 100%
rename from code/User/type.properties
rename to code/User/User.properties
diff --git a/code/Vote/type.properties b/code/Vote/Vote.properties
similarity index 100%
rename from code/Vote/type.properties
rename to code/Vote/Vote.properties