diff --git a/jetstream/administration/naming.md b/jetstream/administration/naming.md
index 4cd176c..824fe48 100644
--- a/jetstream/administration/naming.md
+++ b/jetstream/administration/naming.md
@@ -1,26 +1,22 @@
-# Stream, Consumer, and Account Names
+# Naming Streams, Consumers, and Accounts
 
-Stream, Consumer (durable name), and Account names are used in both the
-subject namespace used by JetStream and the filesystem backing JetStream
-persistence.  This means that when naming streams, consumers, and
-accounts, names must adhere to subject naming rules as well as being
-friendly to the file system.
+Stream, Consumer \(durable name\), and Account names are used in both the subject namespace used by JetStream and the filesystem backing JetStream persistence. This means that when naming streams, consumers, and accounts, names must adhere to subject naming rules as well as being 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 insensitive 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.
+* 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.**
+
+* Do not use reserved file names like NUL, LPT1, etc.
+* Be aware that some file systems are case insensitive 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.
+
+
 
- We plan to address these limitations in a future release.
diff --git a/jetstream/concepts/consumers.md b/jetstream/concepts/consumers.md
index ff2dff3..c3e5cc6 100644
--- a/jetstream/concepts/consumers.md
+++ b/jetstream/concepts/consumers.md
@@ -22,7 +22,7 @@ When defining Consumers the items below make up the entire configuration of the
 | AckWait | How long to allow messages to remain un-acknowledged before attempting redelivery |
 | DeliverPolicy | The initial starting mode of the consumer, `DeliverAll`, `DeliverLast`, `DeliverNew`, `DeliverByStartSequence` or `DeliverByStartTime` |
 | DeliverySubject | The subject to deliver observed messages. Useful to setup an alternate subject for a regular NatsSubcriber can listen on that subject. Not allowed for pull subscriptions. |
-| Durable | The name of the Consumer, which the server will track, allowing resuming consumption where left off. See [naming](../../administration/naming.md].|
+| Durable | The name of the Consumer, which the server will track, allowing resuming consumption where left off. See \[naming\]\(../../administration/naming.md\]. |
 | FilterSubject | When consuming from a Stream with many subjects, or wildcards, select only a specific incoming subjects, supports wildcards |
 | MaxDeliver | Maximum amount times a specific message will be delivered.  Use this to avoid poison pills crashing all your services forever |
 | OptStartSeq | When first consuming messages from the Stream start at this particular message in the set |
diff --git a/jetstream/concepts/streams.md b/jetstream/concepts/streams.md
index 296ba69..c107576 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 asterisk \(`*`\). 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 |