--- trunk/lib/Frey/View/Exhibit.pm	2008/11/19 14:39:10	454
+++ trunk/lib/Frey/View/Exhibit.pm	2008/11/19 15:28:23	455
@@ -24,19 +24,19 @@
 #	required => 1,
 );
 
-sub data {
+sub as_data {
 	my ($self) = @_;
 
-	confess "need sponge" unless $self->sponge;
+	confess "need sponge" unless $self->as_sponge;
 
 	my $items;
-	my $names = $self->sponge->{NAME};
+	my $names = $self->as_sponge->{NAME};
 
 	my $id = 0;
 	my $have_id = grep { m{^id$} } @$names;
 	my $have_label = grep { m{^label$} } @$names;
 
-	foreach my $row ( @{ $self->sponge->{rows} } ) {
+	foreach my $row ( @{ $self->as_sponge->{rows} } ) {
 		my $item;
 		map { $item->{ $names->[$_] } = $row->[$_] } ( 0 .. $#{ $row } );
 		$item->{id}    = $id unless $have_id;
@@ -51,8 +51,8 @@
 sub depends {
 	my ($self) = @_;
 	$self->add_head(qq{
-		<link href="/Frey::Pipe/markup?pipe=Frey::DelIcioUs/sponge|Frey::View::Exhibit/data|Frey::JSON/markup"
-			type="application/json" rel="exhibit/data" />
+		<link href="/Frey::Pipe/as_markup?pipe=Frey::DelIcioUs/as_sponge|Frey::View::Exhibit/as_data|Frey::JSON/as_markup"
+			type="application/json" rel="exhibit/as_data" />
 	});
 	$self->add_head(qq|
 		<script src="http://static.simile.mit.edu/exhibit/api-2.0/exhibit-api.js"
@@ -61,7 +61,7 @@
 	warn "# depends";
 }
 
-sub markup {
+sub as_markup {
 	my ($self) = @_;
 
 	return qq|