diff --git a/models/names.go b/models/names.go
new file mode 100644
index 00000000..2faf4f21
--- /dev/null
+++ b/models/names.go
@@ -0,0 +1,187 @@
+package models
+
+import (
+	"math/rand"
+	"time"
+)
+
+// 5-7 chars only
+var NAMES = []string{
+	"logic",
+	"warrant",
+	"iconic",
+	"threat",
+	"strike",
+	"vital",
+	"unity",
+	"audio",
+	"schemer",
+	"depth",
+	"gravitl",
+	"mystic",
+	"donkey",
+	"atomic",
+	"turtle",
+	"monkey",
+	"rabbit",
+	"static",
+	"mosaic",
+	"elite",
+	"stonks",
+	"doggy",
+	"python",
+	"mohawk",
+	"arctic",
+	"linear",
+	"rival",
+	"vibes",
+	"delay",
+	"bridge",
+	"weeble",
+	"combat",
+	"animal",
+	"wobble",
+	"rubble",
+	"bucket",
+	"proof",
+	"worker",
+	"beetle",
+	"racket",
+	"equal",
+	"panda",
+	"antics",
+	"strong",
+	"forum",
+	"koala",
+	"anchor",
+	"ornery",
+	"indigo",
+	"schism",
+	"dragon",
+	"knight",
+	"bishop",
+	"laser",
+	"rhino",
+	"clutch",
+	"shark",
+	"leader",
+	"smelly",
+	"young",
+	"robot",
+	"squish",
+	"chimp",
+	"rocket",
+	"space",
+	"queen",
+	"royal",
+	"flush",
+	"earth",
+	"planet",
+	"heart",
+	"droplet",
+	"dillon",
+	"saturn",
+	"pluto",
+	"school",
+	"alien",
+	"matte",
+	"dingo",
+	"meercat",
+	"cookie",
+	"snack",
+	"goose",
+	"pepper",
+	"melissa",
+}
+
+// must be 4 chars or less
+var SMALL_NAMES = []string{
+	"ace",
+	"tank",
+	"alex",
+	"dude",
+	"root",
+	"sudo",
+	"mars",
+	"meow",
+	"elon",
+	"musk",
+	"moon",
+	"beef",
+	"tack",
+	"matt",
+	"soon",
+	"man",
+	"sup",
+	"yo",
+	"bro",
+	"john",
+	"drop",
+	"dank",
+	"red",
+	"gold",
+	"big",
+	"old",
+	"og",
+	"best",
+	"blue",
+	"lil",
+	"mom",
+	"bot",
+	"farm",
+	"evil",
+	"good",
+	"holy",
+	"rad",
+	"bad",
+	"sad",
+	"mad",
+	"chad",
+	"hat",
+	"pre",
+	"post",
+	"foot",
+	"soft",
+	"hard",
+	"bob",
+	"tree",
+	"lite",
+	"fish",
+	"dark",
+	"true",
+	"cat",
+	"dog",
+	"wow",
+	"yay",
+	"yeet",
+	"zoo",
+	"toy",
+	"boy",
+	"soy",
+	"rude",
+	"nice",
+	"cow",
+	"meh",
+	"shoe",
+	"sock",
+	"toe",
+	"nail",
+	"hair",
+	"nose",
+	"ear",
+	"tear",
+	"lad",
+	"taco",
+	"star",
+	"sun",
+	"ship",
+	"pack",
+	"mule",
+	"drag",
+	"king",
+}
+
+func GenerateNodeName() string {
+	rand.Seed(time.Now().UnixNano())
+	return NAMES[rand.Intn(len(SMALL_NAMES))] + "-" + NAMES[seededRand.Intn(len(NAMES))]
+}
diff --git a/models/node.go b/models/node.go
index 39ccad7f..aeaf158b 100644
--- a/models/node.go
+++ b/models/node.go
@@ -133,9 +133,7 @@ func (node *Node) SetExpirationDateTime() {
 
 func (node *Node) SetDefaultName() {
 	if node.Name == "" {
-		nodeid := StringWithCharset(5, charset)
-		nodename := "node-" + nodeid
-		node.Name = nodename
+		node.Name = GenerateNodeName()
 	}
 }