diff --git a/README.md b/README.md
index e034076..ea42ac6 100644
--- a/README.md
+++ b/README.md
@@ -50,8 +50,9 @@ See `kitchen_sink.sh` examples.
  - [X] Update README.md
  - [X] Update Ruby API docs
  - [X] Update blobs spec to clear out blob folder every time it runs.
- - [ ] Make location of blob folder configurable?
  - [ ] Oops, `lipmaa` field needs to be a hash, not an integer!
+ - [ ] Change draft and message templates to render headers in this order: `author`, `prev`, `lipmaa`, `kind`, `depth`.
+ - [ ] Make location of blob folder configurable?
  - [ ] Update Dev docs in protocol spec to reflect changes to `lipmaa` header.
  - [ ] Update spec document CLI usage examples to reflect API changes in 2020.
  - [ ] BUG: Keys that start with a carriage return (`\n`) freeze tokenizer.
diff --git a/lib/pigeon/lexer.rb b/lib/pigeon/lexer.rb
index f038321..f3232a1 100644
--- a/lib/pigeon/lexer.rb
+++ b/lib/pigeon/lexer.rb
@@ -65,7 +65,7 @@ module Pigeon
     SEPERATOR = /\n/
     AUTHOR = /author #{FEED_VALUE}\n/
     DEPTH = /depth #{NUMERIC}\n/
-    LIPMAA = /prev (#{MESG_VALUE}|#{NULL_VALUE})\n/
+    LIPMAA = /lipmaa (#{MESG_VALUE}|#{NULL_VALUE})\n/
     PREV = /prev (#{MESG_VALUE}|#{NULL_VALUE})\n/
     KIND = /kind #{ALPHANUMERICISH}\n/
     BODY_ENTRY = /#{ALPHANUMERICISH}:#{ANY_VALUE}\n/
diff --git a/spec/pigeon/message_spec.rb b/spec/pigeon/message_spec.rb
index 6e3b400..5312972 100644
--- a/spec/pigeon/message_spec.rb
+++ b/spec/pigeon/message_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe Pigeon::Message do
       "kind unit_test",
       "prev NONE",
       "depth 0",
-      "lipmaa 0",
+      "lipmaa NONE",
       "",
       "a:\"bar\"",
       "b:&CHHABX8Q9D9Q0BY2BBZ6FA7SMAFNE9GGMSDTZVZZC9TK2N9F15QG.sha256",