Index: trunk/src/formats/assimp_loader.cc
===================================================================
--- trunk/src/formats/assimp_loader.cc	(revision 418)
+++ trunk/src/formats/assimp_loader.cc	(revision 419)
@@ -418,6 +418,6 @@
 	}
 
-	data->data = key_channel_set_creator::create( 2 );
-	key_channel_set_creator key_set( data->data );
+	data->data = data_channel_set_creator::create( 2 );
+	data_channel_set_creator key_set( data->data );
 
 	assimp_key_p* pchannel = key_set.add_channel< assimp_key_p >( node->mNumPositionKeys ).data();
Index: trunk/src/formats/md3_loader.cc
===================================================================
--- trunk/src/formats/md3_loader.cc	(revision 418)
+++ trunk/src/formats/md3_loader.cc	(revision 419)
@@ -429,6 +429,6 @@
 		nodes[i].parent_id = -1;
 		nodes[i].target_id = -1;
-		nodes[i].data      = key_channel_set_creator::create( 1 );
-		load_tags( key_channel_set_creator( nodes[i].data ).add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
+		nodes[i].data      = data_channel_set_creator::create( 1 );
+		load_tags( data_channel_set_creator( nodes[i].data ).add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
 	}
 	return new mesh_nodes_data( "tags", node_count, nodes );
Index: trunk/src/formats/md5_loader.cc
===================================================================
--- trunk/src/formats/md5_loader.cc	(revision 418)
+++ trunk/src/formats/md5_loader.cc	(revision 419)
@@ -250,6 +250,6 @@
 				nodes[i].transform = mat4();
 				nodes[i].target_id = -1;
-				nodes[i].data = key_channel_set_creator::create( 1 );
-				key_channel_set_creator( nodes[i].data ).add_channel< md5_key_t >( num_frames );
+				nodes[i].data = data_channel_set_creator::create( 1 );
+				data_channel_set_creator( nodes[i].data ).add_channel< md5_key_t >( num_frames );
 				next_line( sstream );
 			}
Index: trunk/src/formats/nmd_loader.cc
===================================================================
--- trunk/src/formats/nmd_loader.cc	(revision 418)
+++ trunk/src/formats/nmd_loader.cc	(revision 419)
@@ -121,6 +121,6 @@
 		if ( ch_count > 0 )
 		{
-			key_channel_set* kdata = key_channel_set_creator::create( ch_count );
-			key_channel_set_creator kaccess( kdata );
+			data_channel_set* kdata = data_channel_set_creator::create( ch_count );
+			data_channel_set_creator kaccess( kdata );
 			m_node_array[i].data = kdata;
 			for ( uint32 c = 0; c < ch_count; ++c )