Index: trunk/src/formats/assimp_loader.cc
===================================================================
--- trunk/src/formats/assimp_loader.cc	(revision 406)
+++ trunk/src/formats/assimp_loader.cc	(revision 410)
@@ -50,5 +50,5 @@
 };
 
-struct assimp_key_p  { float time; vec3 position; };
+struct assimp_key_p  { float time; vec3 translation; };
 struct assimp_key_r  { float time; quat rotation; };
 struct assimp_key_s  { float time; vec3 scale; };
@@ -430,6 +430,6 @@
 	for ( unsigned np = 0; np < node->mNumPositionKeys; ++np )
 	{
-		pchannel[np].time     = static_cast<float>( node->mPositionKeys[np].mTime );
-		pchannel[np].position = assimp_vec3_cast(node->mPositionKeys[np].mValue);
+		pchannel[np].time        = static_cast<float>( node->mPositionKeys[np].mTime );
+		pchannel[np].translation = assimp_vec3_cast(node->mPositionKeys[np].mValue);
 	}
 	for ( unsigned np = 0; np < node->mNumRotationKeys; ++np )
Index: trunk/src/formats/nmd_loader.cc
===================================================================
--- trunk/src/formats/nmd_loader.cc	(revision 406)
+++ trunk/src/formats/nmd_loader.cc	(revision 410)
@@ -44,5 +44,5 @@
 		source.read( &stream_header, sizeof( stream_header ), 1 );
 		mesh_raw_channel* channel = mesh_raw_channel::create( stream_header.format, stream_header.count );
-		source.read( channel->data, stream_header.format.size, stream_header.count );
+		source.read( channel->data, stream_header.format.element_size(), stream_header.count );
 		mesh->add_channel( channel );
 	}
@@ -126,8 +126,8 @@
 				source.read( &element_header, sizeof( element_header ), 1 );
 				NV_ASSERT( element_header.type == nmd_type::KEY_CHANNEL, "CHANNEL expected!" );
-				nv::nmd_key_channel_header cheader;
+				nv::nmd_stream_header cheader;
 				source.read( &cheader, sizeof( cheader ), 1 );
 				key_raw_channel* channel = key_raw_channel::create( cheader.format, cheader.count );
-				source.read( channel->data, channel->desc.size, channel->count );
+				source.read( channel->data, channel->desc.element_size(), channel->count );
 				kdata->add_channel( channel );
 			}
@@ -191,5 +191,5 @@
 		sheader.count  = chan->count;
 		stream_out.write( &sheader, sizeof( sheader ), 1 );
-		stream_out.write( chan->data, chan->desc.size, chan->count );
+		stream_out.write( chan->data, chan->desc.element_size(), chan->count );
 	}
 }
@@ -205,5 +205,5 @@
 			for ( uint32 c = 0; c < node->data->get_channel_count(); ++c )
 			{
-				total += sizeof( nmd_element_header ) + sizeof( nmd_key_channel_header );
+				total += sizeof( nmd_element_header ) + sizeof( nmd_stream_header );
 				total += node->data->get_channel(c)->size();
 			}
@@ -230,5 +230,5 @@
 		for ( uint32 c = 0; c < chan_count; ++c )
 		{
-			chan_size += sizeof( nmd_element_header ) + sizeof( nv::nmd_key_channel_header );
+			chan_size += sizeof( nmd_element_header ) + sizeof( nv::nmd_stream_header );
 			chan_size += node->data->get_channel(c)->size();
 		}
@@ -252,12 +252,12 @@
 			eheader.type     = nmd_type::KEY_CHANNEL;
 			eheader.children = 0;
-			eheader.size     = sizeof( nmd_key_channel_header ) + channel->size();
+			eheader.size     = sizeof( nmd_stream_header ) + channel->size();
 			stream_out.write( &eheader, sizeof( eheader ), 1 );
 
-			nmd_key_channel_header cheader;
+			nmd_stream_header cheader;
 			cheader.format    = channel->desc;
 			cheader.count     = channel->count;
 			stream_out.write( &cheader, sizeof( cheader ), 1 );
-			stream_out.write( channel->data, channel->desc.size, channel->count );
+			stream_out.write( channel->data, channel->desc.element_size(), channel->count );
 		}
 	}