--- a/samples/main-packet.cc	Tue Sep 05 12:54:53 2006 +0200
+++ b/samples/main-packet.cc	Tue Sep 05 13:13:39 2006 +0200
@@ -12,13 +12,13 @@
 	MyChunk ();
 	virtual ~MyChunk ();
 
-	void set_data (uint16_t data);
-	uint16_t get_data (void) const;
+	void setData (uint16_t data);
+	uint16_t getData (void) const;
 private:
 	virtual void print (std::ostream *os) const;
-	virtual void add_to (Buffer *buffer) const;
-	virtual void peek_from (Buffer const *buffer);
-	virtual void remove_from (Buffer *buffer);
+	virtual void addTo (Buffer *buffer) const;
+	virtual void peekFrom (Buffer const *buffer);
+	virtual void removeFrom (Buffer *buffer);
 
 	uint16_t m_data;
 };
@@ -33,35 +33,35 @@
 	*os << "MyChunk data=" << m_data << std::endl;
 }
 void 
-MyChunk::add_to (Buffer *buffer) const
+MyChunk::addTo (Buffer *buffer) const
 {
 	// reserve 2 bytes at head of buffer
-	buffer->add_at_start (2);
+	buffer->addAtStart (2);
 	Buffer::Iterator i = buffer->begin ();
 	// serialize in head of buffer
-	i.write_hton_u16 (m_data);
+	i.writeHtonU16 (m_data);
 }
 void 
-MyChunk::peek_from (Buffer const *buffer)
+MyChunk::peekFrom (Buffer const *buffer)
 {
 	Buffer::Iterator i = buffer->begin ();
 	// deserialize from head of buffer
-	m_data = i.read_ntoh_u16 ();
+	m_data = i.readNtohU16 ();
 }
 void 
-MyChunk::remove_from (Buffer *buffer)
+MyChunk::removeFrom (Buffer *buffer)
 {
 	// remove deserialized data
-	buffer->remove_at_start (2);
+	buffer->removeAtStart (2);
 }
 
 void 
-MyChunk::set_data (uint16_t data)
+MyChunk::setData (uint16_t data)
 {
 	m_data = data;
 }
 uint16_t 
-MyChunk::get_data (void) const
+MyChunk::getData (void) const
 {
 	return m_data;
 }
@@ -79,9 +79,9 @@
 	MyChunk my;
 	p.peek (&my);
 	p.remove (&my);
-	std::cout << "received data=" << my.get_data () << std::endl;
-	struct MyTag my_tag;
-	p.peek_tag (&my_tag);
+	std::cout << "received data=" << my.getData () << std::endl;
+	struct MyTag myTag;
+	p.peekTag (&myTag);
 }
 
 
@@ -89,12 +89,12 @@
 {
 	Packet p;
 	MyChunk my;
-	my.set_data (2);
+	my.setData (2);
 	std::cout << "send data=2" << std::endl;
 	p.add (&my);
-	struct MyTag my_tag;
-	my_tag.m_streamId = 5;
-	p.add_tag (&my_tag);
+	struct MyTag myTag;
+	myTag.m_streamId = 5;
+	p.addTag (&myTag);
 	receive (p);
 	return 0;
 }