diff --git a/cmd/nats-server-config-reloader/main.go b/cmd/nats-server-config-reloader/main.go
index 5d9b7978..be9c5fde 100644
--- a/cmd/nats-server-config-reloader/main.go
+++ b/cmd/nats-server-config-reloader/main.go
@@ -54,8 +54,8 @@ func main() {
 	fs.BoolVar(&showVersion, "v", false, "Show version")
 	fs.BoolVar(&showVersion, "version", false, "Show version")
 
-	fs.StringVar(&nconfig.PidFile, "P", "/var/run/nats/gnatsd.pid", "NATS Server Pid File")
-	fs.StringVar(&nconfig.PidFile, "pid", "/var/run/nats/gnatsd.pid", "NATS Server Pid File")
+	fs.StringVar(&nconfig.PidFile, "P", "/var/run/nats/nats.pid", "NATS Server Pid File")
+	fs.StringVar(&nconfig.PidFile, "pid", "/var/run/nats/nats.pid", "NATS Server Pid File")
 	fs.Var(&fileSet, "c", "NATS Server Config File (may be repeated to specify more than one)")
 	fs.Var(&fileSet, "config", "NATS Server Config File (may be repeated to specify more than one)")
 	fs.IntVar(&nconfig.MaxRetries, "max-retries", 30, "Max attempts to trigger reload")
@@ -66,7 +66,7 @@ func main() {
 
 	nconfig.WatchedFiles = fileSet
 	if len(fileSet) == 0 {
-		nconfig.WatchedFiles = []string{"/etc/nats-config/gnatsd.conf"}
+		nconfig.WatchedFiles = []string{"/etc/nats-config/nats.conf"}
 	}
 	nconfig.Signal = syscall.Signal(customSignal)
 
diff --git a/pkg/natsreloader/natsreloader.go b/pkg/natsreloader/natsreloader.go
index 0eba35d0..2d93bcaf 100644
--- a/pkg/natsreloader/natsreloader.go
+++ b/pkg/natsreloader/natsreloader.go
@@ -26,6 +26,7 @@ import (
 	"regexp"
 	"sort"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -217,6 +218,10 @@ func (r *Reloader) init() (*fsnotify.Watcher, map[string][]byte, error) {
 	watchedFiles := make([]string, 0)
 
 	for _, c := range r.WatchedFiles {
+		// Only try to parse config files
+		if !strings.HasSuffix(c, ".conf") {
+			continue
+		}
 		childFiles, err := getServerFiles(c)
 		if err != nil {
 			return nil, nil, err