17 files changed, 21 insertions, 19 deletions
diff --git a/README.md b/README.md
index 92e90ef..cd59350 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,9 @@ Contains two kinds of subfolders:
 Each implementation folder contains:
 
 - `lilliput-ae.h`: main API
-- `lilliput-ae-i.c`: implementation of Lilliput-Ⅰ (ΘCB3-based)
-- `lilliput-ae-ii.c`: implementation of Lilliput-Ⅱ (SCT-2-based)
 - `lilliput-ae-utils.h`: helper functions used by both AE schemes
+- `lilliput-i.c`: implementation of Lilliput-Ⅰ (ΘCB3-based)
+- `lilliput-ii.c`: implementation of Lilliput-Ⅱ (SCT-2-based)
 - `tweakey.*`: implementation of Lilliput-TBC's tweakey schedule
 - `cipher.*`: implementation of the tweakable block-cipher
   Lilliput-TBC
diff --git a/nist/make-package.sh b/nist/make-package.sh
index dd50f54..30debe3 100755
--- a/nist/make-package.sh
+++ b/nist/make-package.sh
@@ -46,7 +46,8 @@ add-variant ()
     source_files=(
         cipher.{c,h}
         constants.h
-        lilliput-ae{.h,-utils.h,-${mode}.c}
+        lilliput-ae{.h,-utils.h}
+        lilliput-${mode}.c
         tweakey.{c,h}
     )
 
diff --git a/src/add_tweakeysequences/lilliput-ae-i.c b/src/add_tweakeysequences/lilliput-ae-i.c
deleted file mode 120000
index 2ed1026..0000000
--- a/src/add_tweakeysequences/lilliput-ae-i.c
+++ /dev/null
@@ -1 +0,0 @@
-../ref/lilliput-ae-i.c
-\ No newline at end of file
diff --git a/src/add_tweakeysequences/lilliput-ae-ii.c b/src/add_tweakeysequences/lilliput-ae-ii.c
deleted file mode 120000
index af141f8..0000000
--- a/src/add_tweakeysequences/lilliput-ae-ii.c
+++ /dev/null
@@ -1 +0,0 @@
-../ref/lilliput-ae-ii.c
-\ No newline at end of file
diff --git a/src/add_tweakeysequences/lilliput-i.c b/src/add_tweakeysequences/lilliput-i.c
new file mode 120000
index 0000000..46688d4
--- /dev/null
+++ b/src/add_tweakeysequences/lilliput-i.c
@@ -0,0 +1 @@
+../ref/lilliput-i.c
+\ No newline at end of file
diff --git a/src/add_tweakeysequences/lilliput-ii.c b/src/add_tweakeysequences/lilliput-ii.c
new file mode 120000
index 0000000..09abf10
--- /dev/null
+++ b/src/add_tweakeysequences/lilliput-ii.c
@@ -0,0 +1 @@
+../ref/lilliput-ii.c
+\ No newline at end of file
diff --git a/src/add_tweakeyunrolled/lilliput-ae-i.c b/src/add_tweakeyunrolled/lilliput-ae-i.c
deleted file mode 120000
index 2ed1026..0000000
--- a/src/add_tweakeyunrolled/lilliput-ae-i.c
+++ /dev/null
@@ -1 +0,0 @@
-../ref/lilliput-ae-i.c
-\ No newline at end of file
diff --git a/src/add_tweakeyunrolled/lilliput-ae-ii.c b/src/add_tweakeyunrolled/lilliput-ae-ii.c
deleted file mode 120000
index af141f8..0000000
--- a/src/add_tweakeyunrolled/lilliput-ae-ii.c
+++ /dev/null
@@ -1 +0,0 @@
-../ref/lilliput-ae-ii.c
-\ No newline at end of file
diff --git a/src/add_tweakeyunrolled/lilliput-i.c b/src/add_tweakeyunrolled/lilliput-i.c
new file mode 120000
index 0000000..46688d4
--- /dev/null
+++ b/src/add_tweakeyunrolled/lilliput-i.c
@@ -0,0 +1 @@
+../ref/lilliput-i.c
+\ No newline at end of file
diff --git a/src/add_tweakeyunrolled/lilliput-ii.c b/src/add_tweakeyunrolled/lilliput-ii.c
new file mode 120000
index 0000000..09abf10
--- /dev/null
+++ b/src/add_tweakeyunrolled/lilliput-ii.c
@@ -0,0 +1 @@
+../ref/lilliput-ii.c
+\ No newline at end of file
diff --git a/src/ref/lilliput-ae.h b/src/ref/lilliput-ae.h
index f2d7c82..48721fe 100644
--- a/src/ref/lilliput-ae.h
+++ b/src/ref/lilliput-ae.h
@@ -13,7 +13,7 @@ http://creativecommons.org/publicdomain/zero/1.0/
 ---
 
 This file provides the interface for both Lilliput-I and Lilliput-II,
-implemented by lilliput-ae-i.c and lilliput-ae-ii.c respectively.
+implemented by lilliput-i.c and lilliput-ii.c respectively.
 */
 
 #ifndef LILLIPUT_AE_H
diff --git a/src/ref/lilliput-ae-i.c b/src/ref/lilliput-i.c
index 5e91e4e..5e91e4e 100644
--- a/src/ref/lilliput-ae-i.c
+++ b/src/ref/lilliput-i.c
diff --git a/src/ref/lilliput-ae-ii.c b/src/ref/lilliput-ii.c
index 8238b08..8238b08 100644
--- a/src/ref/lilliput-ae-ii.c
+++ b/src/ref/lilliput-ii.c
diff --git a/test/check-implementation.sh b/test/check-implementation.sh
index 76616e2..4113637 100755
--- a/test/check-implementation.sh
+++ b/test/check-implementation.sh
@@ -27,7 +27,8 @@ run-genkat ()
     local source_files=(
         cipher.{c,h}
         constants.h
-        lilliput-ae{.h,-utils.h,-${mode}.c}
+        lilliput-ae{.h,-utils.h}
+        lilliput-${mode}.c
         tweakey.{c,h}
     )
 
diff --git a/test/common.mk b/test/common.mk
index c3182cb..677dcbe 100644
--- a/test/common.mk
+++ b/test/common.mk
@@ -70,7 +70,7 @@ $(results_dir)/test-tbc-decrypt $(results_dir)/test-tbc-encrypt $(results_dir)/t
 $(results_dir)/src/cipher.o $(results_dir)/src/tweakey.o
 
 $(results_dir)/test-ae-decrypt $(results_dir)/test-ae-encrypt $(results_dir)/test-ae-roundtrip $(results_dir)/traces-ae: \
-$(results_dir)/src/lilliput-ae-$(mode).o $(results_dir)/src/cipher.o                                                     \
+$(results_dir)/src/lilliput-$(mode).o $(results_dir)/src/cipher.o                                                     \
 $(results_dir)/src/tweakey.o
 
 $(results_dir)/test-tweakey: $(results_dir)/src/tweakey.o
@@ -80,8 +80,8 @@ $(results_dir)/test-tweakey: $(results_dir)/src/tweakey.o
 $(results_dir)/$(src_dir)/cipher.o: $(src_dir)/cipher.h                 \
 $(src_dir)/tweakey.h $(variant_dir)/parameters.h
 
-$(results_dir)/$(src_dir)/lilliput-ae-i.o $(results_dir)/$(src_dir)/lilliput-ae-ii.o:   \
-$(src_dir)/lilliput-ae.h $(src_dir)/cipher.h $(src_dir)/constants.h                     \
+$(results_dir)/$(src_dir)/lilliput-i.o $(results_dir)/$(src_dir)/lilliput-ii.o: \
+$(src_dir)/lilliput-ae.h $(src_dir)/cipher.h $(src_dir)/constants.h             \
 $(variant_dir)/parameters.h
 
 $(results_dir)/$(src_dir)/tweakey.o: $(src_dir)/tweakey.h       \
diff --git a/test/felics/Makefile b/test/felics/Makefile
index 7a7a672..e6a2e91 100644
--- a/test/felics/Makefile
+++ b/test/felics/Makefile
@@ -19,7 +19,7 @@ vector: $(results_dir)/felics-make-vector | $(results_dir)
 
 
 $(results_dir)/felics-make-vector: $(results_dir)/felics-make-vector.o \
-$(results_dir)/src/lilliput-ae-$(mode).o $(results_dir)/src/cipher.o   \
+$(results_dir)/src/lilliput-$(mode).o $(results_dir)/src/cipher.o   \
 $(results_dir)/src/tweakey.o | $(results_dir)
 
 $(results_dir)/felics-make-vector.o: $(test_dir)/felics/make-vector.c | $(results_dir)
diff --git a/traces/traces-ae.patch b/traces/traces-ae.patch
index cfe6cdb..9822a35 100644
--- a/traces/traces-ae.patch
+++ b/traces/traces-ae.patch
@@ -1,7 +1,7 @@
-diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c
+diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-i.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-i.c
 index 2754fbb..061a24e 100644
---- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c
-+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c
+--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-i.c
++++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-i.c
 @@ -15,6 +15,8 @@ http://creativecommons.org/publicdomain/zero/1.0/
  This file implements Lilliput-AE's nonce-respecting mode based on ΘCB3.
  */
@@ -135,10 +135,10 @@ index 2754fbb..061a24e 100644
  }
  
  
-diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c
+diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ii.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ii.c
 index 862892c..7dfb38e 100644
---- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c
-+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c
+--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ii.c
++++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ii.c
 @@ -15,6 +15,8 @@ http://creativecommons.org/publicdomain/zero/1.0/
  This file implements Lilliput-AE's nonce-misuse-resistant mode based on SCT-2.
  */