diff --git a/jetstream/administration/naming.md b/jetstream/administration/naming.md
index f458d20..914c41e 100644
--- a/jetstream/administration/naming.md
+++ b/jetstream/administration/naming.md
@@ -9,13 +9,18 @@ friendly to the file system.
 We recommend the following guideline for stream, consumer, and account names:
 
 * Alphanumeric values are recommended.
+<<<<<<< HEAD
 * Spaces, tabs, period \(`.`\), greater than \(`>`\) or asterix \(`*`\) are prohibited.
 * Limit name length.  The JetStream storage directories will include the account,
 stream name, and consumer name, so a generally safe approach would be to keep names
 under 32 characters.
+=======
+* Spaces, tabs, period \(`.`\), greater than \(`>`\) or asterisk \(`*`\) are prohibited.
+* Limit names to 255 characters or less.
+>>>>>>> 60f3fbb79fa5c1aa9c6d18b3d45321820e228b77
 * Do not use reserved file names like NUL, LPT1, etc.
 * Be aware that some file systems are case insentitive so do not
   use stream or account names that would collide in a file system.
   For example, `Foo` and `foo` would collide on a Windows or Mac OSx System.
 
- We plan to address these limitations in a future release.
\ No newline at end of file
+ We plan to address these limitations in a future release.
diff --git a/jetstream/concepts/streams.md b/jetstream/concepts/streams.md
index eaa0373..296ba69 100644
--- a/jetstream/concepts/streams.md
+++ b/jetstream/concepts/streams.md
@@ -16,7 +16,7 @@ When defining Streams the items below make up the entire configuration of the se
 
 | Item | Description |
 | :--- | :--- |
-| Name | A name for the Stream that may not have spaces, tabs, period \(`.`\), greater than \(`>`\) or asterix \(`*`\). See [naming](../administration/naming.md] |
+| Name | A name for the Stream that may not have spaces, tabs, period \(`.`\), greater than \(`>`\) or asterisk \(`*`\). See [naming](../administration/naming.md] |
 | Storage | The type of storage backend, `File` and `Memory` |
 | Subjects | A list of subjects to consume, supports wildcards |
 | Replicas | How many replicas to keep for each message in a clustered JetStream, maximum 5 |