diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
index 508450fd4..07ad7618c 100644
--- a/pkg/nfd-master/nfd-master.go
+++ b/pkg/nfd-master/nfd-master.go
@@ -43,7 +43,7 @@ import (
 )
 
 const (
-	// LabelNs defines the Namespace for feature labels
+	// LabelNs defines the namespace for feature labels
 	LabelNs = "feature.node.kubernetes.io"
 
 	// AnnotationNsBase namespace for all NFD-related annotations
diff --git a/source/custom/custom.go b/source/custom/custom.go
index f336b49ff..6783b4b41 100644
--- a/source/custom/custom.go
+++ b/source/custom/custom.go
@@ -57,7 +57,7 @@ type Source struct {
 }
 
 // Name returns the name of the feature source
-func (s Source) Name() string { return "custom" }
+func (s Source) Name() string { return Name }
 
 // NewConfig method of the FeatureSource interface
 func (s *Source) NewConfig() source.Config { return newDefaultConfig() }
diff --git a/source/local/local.go b/source/local/local.go
index 38e0c147d..8b196139b 100644
--- a/source/local/local.go
+++ b/source/local/local.go
@@ -42,7 +42,7 @@ var (
 type Source struct{}
 
 // Name returns the name of the feature source
-func (s Source) Name() string { return "local" }
+func (s Source) Name() string { return Name }
 
 // NewConfig method of the FeatureSource interface
 func (s *Source) NewConfig() source.Config { return nil }
diff --git a/source/pci/pci.go b/source/pci/pci.go
index fe2702e65..c78da29c9 100644
--- a/source/pci/pci.go
+++ b/source/pci/pci.go
@@ -47,7 +47,7 @@ type Source struct {
 }
 
 // Name returns the name of the feature source
-func (s Source) Name() string { return "pci" }
+func (s Source) Name() string { return Name }
 
 // NewConfig method of the FeatureSource interface
 func (s *Source) NewConfig() source.Config { return newDefaultConfig() }
diff --git a/source/usb/usb.go b/source/usb/usb.go
index e9566ef4c..0d386612b 100644
--- a/source/usb/usb.go
+++ b/source/usb/usb.go
@@ -50,7 +50,7 @@ type Source struct {
 }
 
 // Name returns the name of the feature source
-func (s Source) Name() string { return "usb" }
+func (s Source) Name() string { return Name }
 
 // NewConfig method of the FeatureSource interface
 func (s *Source) NewConfig() source.Config { return newDefaultConfig() }