1 files changed, 4 insertions, 4 deletions
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index bb555f9..aff5762 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -216,7 +216,7 @@ public class ECTester {
         actions.addOption(Option.builder("ln").longOpt("list-named").desc("Print the list of supported named curves and keys.").hasArg().argName("what").optionalArg(true).build());
         actions.addOption(Option.builder("e").longOpt("export").desc("Export the defaut curve parameters of the card(if any).").build());
         actions.addOption(Option.builder("g").longOpt("generate").desc("Generate [amount] of EC keys.").hasArg().argName("amount").optionalArg(true).build());
-        actions.addOption(Option.builder("t").longOpt("test").desc("Test ECC support. [test_suite]:\n- default:\n- invalid:\n- wrong:\n- nonprime:\n- test-vectors:").hasArg().argName("test_suite").optionalArg(true).build());
+        actions.addOption(Option.builder("t").longOpt("test").desc("Test ECC support. [test_suite]:\n- default:\n- invalid:\n- wrong:\n- composite:\n- test-vectors:").hasArg().argName("test_suite").optionalArg(true).build());
         actions.addOption(Option.builder("dh").longOpt("ecdh").desc("Do ECDH, [count] times.").hasArg().argName("count").optionalArg(true).build());
         actions.addOption(Option.builder("dhc").longOpt("ecdhc").desc("Do ECDHC, [count] times.").hasArg().argName("count").optionalArg(true).build());
         actions.addOption(Option.builder("dsa").longOpt("ecdsa").desc("Sign data with ECDSA, [count] times.").hasArg().argName("count").optionalArg(true).build());
@@ -422,8 +422,8 @@ public class ECTester {
                     case "wrong":
                         suite = new TestSuite.Wrong(dataStore, cfg, systemOutLogger);
                         break;
-                    case "nonprime":
-                        suite = new TestSuite.NonPrime(dataStore, cfg, systemOutLogger);
+                    case "composite":
+                        suite = new TestSuite.Composite(dataStore, cfg, systemOutLogger);
                         break;
                     case "invalid":
                         suite = new TestSuite.Invalid(dataStore, cfg, systemOutLogger);
@@ -739,7 +739,7 @@ public class ECTester {
                 }
 
                 testSuite = cli.getOptionValue("test", "default").toLowerCase();
-                String[] tests = new String[]{"default", "nonprime", "invalid", "test-vectors", "wrong"};
+                String[] tests = new String[]{"default", "composite", "invalid", "test-vectors", "wrong"};
                 List<String> testsList = Arrays.asList(tests);
                 if (!testsList.contains(testSuite)) {
                     System.err.println("Unknown test case. Should be one of: " + Arrays.toString(tests));