diff --git a/integrations/inputunifi/pollerunifi/influx_clients.go b/integrations/inputunifi/pollerinflux/clients.go
similarity index 99%
rename from integrations/inputunifi/pollerunifi/influx_clients.go
rename to integrations/inputunifi/pollerinflux/clients.go
index 883528c5..45f08e1c 100644
--- a/integrations/inputunifi/pollerunifi/influx_clients.go
+++ b/integrations/inputunifi/pollerinflux/clients.go
@@ -1,4 +1,4 @@
-package pollerunifi
+package pollerinflux
 
 import (
 	"time"
diff --git a/integrations/inputunifi/pollerunifi/influx_ids.go b/integrations/inputunifi/pollerinflux/ids.go
similarity index 98%
rename from integrations/inputunifi/pollerunifi/influx_ids.go
rename to integrations/inputunifi/pollerinflux/ids.go
index 1c4c5378..740f66be 100644
--- a/integrations/inputunifi/pollerunifi/influx_ids.go
+++ b/integrations/inputunifi/pollerinflux/ids.go
@@ -1,4 +1,4 @@
-package pollerunifi
+package pollerinflux
 
 import (
 	influx "github.com/influxdata/influxdb1-client/v2"
diff --git a/integrations/inputunifi/pollerunifi/influx_site.go b/integrations/inputunifi/pollerinflux/site.go
similarity index 99%
rename from integrations/inputunifi/pollerunifi/influx_site.go
rename to integrations/inputunifi/pollerinflux/site.go
index c025e14a..0f12bbe4 100644
--- a/integrations/inputunifi/pollerunifi/influx_site.go
+++ b/integrations/inputunifi/pollerinflux/site.go
@@ -1,4 +1,4 @@
-package pollerunifi
+package pollerinflux
 
 import (
 	"strings"
diff --git a/integrations/inputunifi/pollerunifi/influx_uap.go b/integrations/inputunifi/pollerinflux/uap.go
similarity index 99%
rename from integrations/inputunifi/pollerunifi/influx_uap.go
rename to integrations/inputunifi/pollerinflux/uap.go
index 6563440a..fc0668ff 100644
--- a/integrations/inputunifi/pollerunifi/influx_uap.go
+++ b/integrations/inputunifi/pollerinflux/uap.go
@@ -1,4 +1,4 @@
-package pollerunifi
+package pollerinflux
 
 import (
 	"time"
diff --git a/integrations/inputunifi/pollerunifi/influx_udm.go b/integrations/inputunifi/pollerinflux/udm.go
similarity index 99%
rename from integrations/inputunifi/pollerunifi/influx_udm.go
rename to integrations/inputunifi/pollerinflux/udm.go
index 0ff7ecfc..54d66389 100644
--- a/integrations/inputunifi/pollerunifi/influx_udm.go
+++ b/integrations/inputunifi/pollerinflux/udm.go
@@ -1,4 +1,4 @@
-package pollerunifi
+package pollerinflux
 
 import (
 	"time"
diff --git a/integrations/inputunifi/pollerunifi/influx_usg.go b/integrations/inputunifi/pollerinflux/usg.go
similarity index 99%
rename from integrations/inputunifi/pollerunifi/influx_usg.go
rename to integrations/inputunifi/pollerinflux/usg.go
index 57dfdd12..40c92233 100644
--- a/integrations/inputunifi/pollerunifi/influx_usg.go
+++ b/integrations/inputunifi/pollerinflux/usg.go
@@ -1,4 +1,4 @@
-package pollerunifi
+package pollerinflux
 
 import (
 	"strings"
diff --git a/integrations/inputunifi/pollerunifi/influx_usw.go b/integrations/inputunifi/pollerinflux/usw.go
similarity index 99%
rename from integrations/inputunifi/pollerunifi/influx_usw.go
rename to integrations/inputunifi/pollerinflux/usw.go
index fe39f95d..aa608bb8 100644
--- a/integrations/inputunifi/pollerunifi/influx_usw.go
+++ b/integrations/inputunifi/pollerinflux/usw.go
@@ -1,4 +1,4 @@
-package pollerunifi
+package pollerinflux
 
 import (
 	"time"
diff --git a/integrations/inputunifi/pollerunifi/unifi.go b/integrations/inputunifi/pollerunifi/unifi.go
index aac1f625..fe1db125 100644
--- a/integrations/inputunifi/pollerunifi/unifi.go
+++ b/integrations/inputunifi/pollerunifi/unifi.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/davidnewhall/unifi-poller/pollerinflux"
 	influx "github.com/influxdata/influxdb1-client/v2"
 	"golift.io/unifi"
 )
@@ -205,15 +206,15 @@ func (m *Metrics) ProcessPoints() []error {
 	}
 
 	for _, asset := range m.Sites {
-		pts, err := SitePoints(asset, m.TS)
+		pts, err := pollerinflux.SitePoints(asset, m.TS)
 		processPoints(m, pts, err)
 	}
 	for _, asset := range m.Clients {
-		pts, err := ClientPoints(asset, m.TS)
+		pts, err := pollerinflux.ClientPoints(asset, m.TS)
 		processPoints(m, pts, err)
 	}
 	for _, asset := range m.IDSList {
-		pts, err := IDSPoints(asset) // no m.TS.
+		pts, err := pollerinflux.IDSPoints(asset) // no m.TS.
 		processPoints(m, pts, err)
 	}
 
@@ -221,19 +222,19 @@ func (m *Metrics) ProcessPoints() []error {
 		return errs
 	}
 	for _, asset := range m.Devices.UAPs {
-		pts, err := UAPPoints(asset, m.TS)
+		pts, err := pollerinflux.UAPPoints(asset, m.TS)
 		processPoints(m, pts, err)
 	}
 	for _, asset := range m.Devices.USGs {
-		pts, err := USGPoints(asset, m.TS)
+		pts, err := pollerinflux.USGPoints(asset, m.TS)
 		processPoints(m, pts, err)
 	}
 	for _, asset := range m.Devices.USWs {
-		pts, err := USWPoints(asset, m.TS)
+		pts, err := pollerinflux.USWPoints(asset, m.TS)
 		processPoints(m, pts, err)
 	}
 	for _, asset := range m.Devices.UDMs {
-		pts, err := UDMPoints(asset, m.TS)
+		pts, err := pollerinflux.UDMPoints(asset, m.TS)
 		processPoints(m, pts, err)
 	}
 	return errs