diff --git a/internal/pkg/config/buildconfig.go.in b/internal/pkg/config/buildconfig.go.in
index 57ef0fba..5316e518 100644
--- a/internal/pkg/config/buildconfig.go.in
+++ b/internal/pkg/config/buildconfig.go.in
@@ -8,7 +8,7 @@ type BuildConfig struct {
 	Datadir        string `default:"@DATADIR@"`
 	Localstatedir  string `default:"@LOCALSTATEDIR@"`
 	Srvdir         string `default:"@SRVDIR@"`
-	TFTPdir        string `default:"@TFTPDIR@"`
+	Tftpdir        string `default:"@TFTPDIR@"`
 	Firewallddir   string `default:"@FIREWALLDDIR@"`
 	Systemddir     string `default:"@SYSTEMDDIR@"`
 	WWOverlaydir   string `default:"@WWOVERLAYDIR@"`
diff --git a/internal/pkg/config/root.go b/internal/pkg/config/root.go
index 9ffd667a..67c4447a 100644
--- a/internal/pkg/config/root.go
+++ b/internal/pkg/config/root.go
@@ -95,15 +95,15 @@ func (conf *RootConf) Read(confFileName string) (error) {
 func (conf *RootConf) Parse(data []byte) (error) {
 	// ipxe binaries are merged not overwritten, store defaults separate
 	defIpxe := make(map[string]string)
-	for k, v := range conf.TFTP.IPXEBinaries {
+	for k, v := range conf.TFTP.IpxeBinaries {
 		defIpxe[k] = v
-		delete(conf.TFTP.IPXEBinaries, k)
+		delete(conf.TFTP.IpxeBinaries, k)
 	}
 	if err := yaml.Unmarshal(data, &conf); err != nil {
 		return err
 	}
-	if len(conf.TFTP.IPXEBinaries) == 0 {
-		conf.TFTP.IPXEBinaries = defIpxe
+	if len(conf.TFTP.IpxeBinaries) == 0 {
+		conf.TFTP.IpxeBinaries = defIpxe
 	}
 	return nil
 }
diff --git a/internal/pkg/config/tftp.go b/internal/pkg/config/tftp.go
index 6681df55..ca368414 100644
--- a/internal/pkg/config/tftp.go
+++ b/internal/pkg/config/tftp.go
@@ -5,9 +5,9 @@ package config
 // Warewulf will configure.
 type TFTPConf struct {
 	Enabled      bool              `yaml:"enabled" default:"true"`
-	TFTPRoot     string            `yaml:"tftproot" default:"/var/lib/tftpboot"`
+	TftpRoot     string            `yaml:"tftproot" default:"/var/lib/tftpboot"`
 	SystemdName  string            `yaml:"systemd name" default:"tftp"`
 
 	// Path is relative to buildconfig.DATADIR()
-	IPXEBinaries map[string]string `yaml:"ipxe" default:"{\"00:09\": \"x86_64.efi\",\"00:00\": \"x86_64.kpxe\",\"00:0B\": \"arm64.efi\",\"00:07\":  \"x86_64.efi\"}"`
+	IpxeBinaries map[string]string `yaml:"ipxe" default:"{\"00:09\": \"x86_64.efi\",\"00:00\": \"x86_64.kpxe\",\"00:0B\": \"arm64.efi\",\"00:07\":  \"x86_64.efi\"}"`
 }
diff --git a/internal/pkg/configure/tftp.go b/internal/pkg/configure/tftp.go
index 333a7961..1c8da005 100644
--- a/internal/pkg/configure/tftp.go
+++ b/internal/pkg/configure/tftp.go
@@ -12,7 +12,7 @@ import (
 
 func TFTP() error {
 	controller := warewulfconf.Get()
-	var tftpdir string = path.Join(controller.Paths.TFTPdir, "warewulf")
+	var tftpdir string = path.Join(controller.Paths.Tftpdir, "warewulf")
 
 	err := os.MkdirAll(tftpdir, 0755)
 	if err != nil {
@@ -22,7 +22,7 @@ func TFTP() error {
 
 	fmt.Printf("Writing PXE files to: %s\n", tftpdir)
 	copyCheck := make(map[string]bool)
-	for _, f := range controller.TFTP.IPXEBinaries {
+	for _, f := range controller.TFTP.IpxeBinaries {
 		if copyCheck[f] {
 			continue
 		}