diff --git a/lang/funcs/contains_polyfunc.go b/lang/funcs/contains_polyfunc.go
index 8bde41ee..a68b4324 100644
--- a/lang/funcs/contains_polyfunc.go
+++ b/lang/funcs/contains_polyfunc.go
@@ -165,7 +165,7 @@ func (obj *ContainsPolyFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *ContainsPolyFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.closeChan = make(chan struct{})
@@ -216,7 +216,7 @@ func (obj *ContainsPolyFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *ContainsPolyFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/core/exchange_polyfunc.go b/lang/funcs/core/exchange_polyfunc.go
index 7c9d0576..06584c93 100644
--- a/lang/funcs/core/exchange_polyfunc.go
+++ b/lang/funcs/core/exchange_polyfunc.go
@@ -65,7 +65,7 @@ func (obj *ExchangeFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *ExchangeFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.watchChan = make(chan error) // XXX: sender should close this, but did I implement that part yet???
@@ -171,7 +171,7 @@ func (obj *ExchangeFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *ExchangeFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/core/kvlookupfunc.go b/lang/funcs/core/kvlookup_func.go
similarity index 97%
rename from lang/funcs/core/kvlookupfunc.go
rename to lang/funcs/core/kvlookup_func.go
index 1ca0bcfc..b4f77d5b 100644
--- a/lang/funcs/core/kvlookupfunc.go
+++ b/lang/funcs/core/kvlookup_func.go
@@ -63,7 +63,7 @@ func (obj *KVLookupFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *KVLookupFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.watchChan = make(chan error) // XXX: sender should close this, but did I implement that part yet???
@@ -160,7 +160,7 @@ func (obj *KVLookupFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *KVLookupFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/core/printf_polyfunc.go b/lang/funcs/core/printf_polyfunc.go
index 33c785d5..2b4b9ddb 100644
--- a/lang/funcs/core/printf_polyfunc.go
+++ b/lang/funcs/core/printf_polyfunc.go
@@ -171,7 +171,7 @@ func (obj *PrintfFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *PrintfFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.closeChan = make(chan struct{})
@@ -230,7 +230,7 @@ func (obj *PrintfFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *PrintfFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/core/random1func.go b/lang/funcs/core/random1_func.go
similarity index 100%
rename from lang/funcs/core/random1func.go
rename to lang/funcs/core/random1_func.go
diff --git a/lang/funcs/core/schedule_polyfunc.go b/lang/funcs/core/schedule_polyfunc.go
index 3c5d8e6d..e35f1622 100644
--- a/lang/funcs/core/schedule_polyfunc.go
+++ b/lang/funcs/core/schedule_polyfunc.go
@@ -248,7 +248,7 @@ func (obj *SchedulePolyFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *SchedulePolyFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.watchChan = make(chan *schedulerResult)
@@ -435,7 +435,7 @@ func (obj *SchedulePolyFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *SchedulePolyFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/core/template_polyfunc.go b/lang/funcs/core/template_polyfunc.go
index 33fb2546..254c1889 100644
--- a/lang/funcs/core/template_polyfunc.go
+++ b/lang/funcs/core/template_polyfunc.go
@@ -150,7 +150,7 @@ func (obj *TemplateFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *TemplateFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.closeChan = make(chan struct{})
@@ -283,7 +283,7 @@ func (obj *TemplateFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *TemplateFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/core/vumeterfunc.go b/lang/funcs/core/vumeter_func.go
similarity index 97%
rename from lang/funcs/core/vumeterfunc.go
rename to lang/funcs/core/vumeter_func.go
index d978b940..f7b7209e 100644
--- a/lang/funcs/core/vumeterfunc.go
+++ b/lang/funcs/core/vumeter_func.go
@@ -66,7 +66,7 @@ func (obj *VUMeterFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *VUMeterFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.closeChan = make(chan struct{})
@@ -164,7 +164,7 @@ func (obj *VUMeterFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *VUMeterFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/facts/core/answerfact.go b/lang/funcs/facts/core/answer_fact.go
similarity index 100%
rename from lang/funcs/facts/core/answerfact.go
rename to lang/funcs/facts/core/answer_fact.go
diff --git a/lang/funcs/facts/core/datetimefact.go b/lang/funcs/facts/core/datetime_fact.go
similarity index 100%
rename from lang/funcs/facts/core/datetimefact.go
rename to lang/funcs/facts/core/datetime_fact.go
diff --git a/lang/funcs/facts/core/flipflopfact.go b/lang/funcs/facts/core/flipflop_fact.go
similarity index 100%
rename from lang/funcs/facts/core/flipflopfact.go
rename to lang/funcs/facts/core/flipflop_fact.go
diff --git a/lang/funcs/facts/core/hostnamefact.go b/lang/funcs/facts/core/hostname_fact.go
similarity index 100%
rename from lang/funcs/facts/core/hostnamefact.go
rename to lang/funcs/facts/core/hostname_fact.go
diff --git a/lang/funcs/facts/core/loadfact.go b/lang/funcs/facts/core/load_fact.go
similarity index 100%
rename from lang/funcs/facts/core/loadfact.go
rename to lang/funcs/facts/core/load_fact.go
diff --git a/lang/funcs/facts/core/load_darwin.go b/lang/funcs/facts/core/load_fact_darwin.go
similarity index 100%
rename from lang/funcs/facts/core/load_darwin.go
rename to lang/funcs/facts/core/load_fact_darwin.go
diff --git a/lang/funcs/facts/core/load_posix.go b/lang/funcs/facts/core/load_fact_posix.go
similarity index 100%
rename from lang/funcs/facts/core/load_posix.go
rename to lang/funcs/facts/core/load_fact_posix.go
diff --git a/lang/funcs/facts/func.go b/lang/funcs/facts/func.go
index 6fdf5012..b8db9ef8 100644
--- a/lang/funcs/facts/func.go
+++ b/lang/funcs/facts/func.go
@@ -66,12 +66,12 @@ func (obj *FactFunc) Init(init *interfaces.Init) error {
 	)
 }
 
-// Stream returns the changing values that this fact has over time.
+// Stream returns the changing values that this function has over time.
 func (obj *FactFunc) Stream() error {
 	return obj.Fact.Stream()
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *FactFunc) Close() error {
 	return obj.Fact.Close()
 }
diff --git a/lang/funcs/history_polyfunc.go b/lang/funcs/history_polyfunc.go
index 6b5605e9..3d2dd7af 100644
--- a/lang/funcs/history_polyfunc.go
+++ b/lang/funcs/history_polyfunc.go
@@ -157,7 +157,7 @@ func (obj *HistoryFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *HistoryFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.closeChan = make(chan struct{})
@@ -227,7 +227,7 @@ func (obj *HistoryFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *HistoryFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/maplookup_polyfunc.go b/lang/funcs/maplookup_polyfunc.go
index 9ff2cab9..c188ef94 100644
--- a/lang/funcs/maplookup_polyfunc.go
+++ b/lang/funcs/maplookup_polyfunc.go
@@ -221,7 +221,7 @@ func (obj *MapLookupPolyFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *MapLookupPolyFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.closeChan = make(chan struct{})
@@ -278,7 +278,7 @@ func (obj *MapLookupPolyFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *MapLookupPolyFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/operator_polyfunc.go b/lang/funcs/operator_polyfunc.go
index d68d3501..f2b4992f 100644
--- a/lang/funcs/operator_polyfunc.go
+++ b/lang/funcs/operator_polyfunc.go
@@ -550,7 +550,7 @@ func (obj *OperatorPolyFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *OperatorPolyFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.closeChan = make(chan struct{})
@@ -630,7 +630,7 @@ func (obj *OperatorPolyFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *OperatorPolyFunc) Close() error {
 	close(obj.closeChan)
 	return nil
diff --git a/lang/funcs/structlookup_polyfunc.go b/lang/funcs/structlookup_polyfunc.go
index 112039aa..59e4e965 100644
--- a/lang/funcs/structlookup_polyfunc.go
+++ b/lang/funcs/structlookup_polyfunc.go
@@ -210,7 +210,7 @@ func (obj *StructLookupPolyFunc) Info() *interfaces.Info {
 	}
 }
 
-// Init runs some startup code for this fact.
+// Init runs some startup code for this function.
 func (obj *StructLookupPolyFunc) Init(init *interfaces.Init) error {
 	obj.init = init
 	obj.closeChan = make(chan struct{})
@@ -275,7 +275,7 @@ func (obj *StructLookupPolyFunc) Stream() error {
 	}
 }
 
-// Close runs some shutdown code for this fact and turns off the stream.
+// Close runs some shutdown code for this function and turns off the stream.
 func (obj *StructLookupPolyFunc) Close() error {
 	close(obj.closeChan)
 	return nil