diff --git a/gigaparsec.go b/gigaparsec.go
index a199d2c..f660679 100644
--- a/gigaparsec.go
+++ b/gigaparsec.go
@@ -81,18 +81,15 @@ type Message struct {
 	expected []string
 }
 
-// TODO rename
-func (m Message) PosMethod() uint64 {
+func (m Message) Pos() uint64 {
 	return m.pos
 }
 
-// TODO rename
-func (m Message) GotMethod() string {
+func (m Message) Got() string {
 	return m.got
 }
 
-// TODO rename
-func (m Message) ExpectedMethod() []string {
+func (m Message) Expected() []string {
 	return m.expected
 }