diff --git a/README.md b/README.md
index c032cb7..6545ff4 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Prebuilt Raspberry Pi image for running a HAM radio APRS Internet Gateway using
 
 ### Installation
 1. Download & Flash the image to an SD card
-2. Insert SD card into a computer and load your wpa_supplicant.conf into boot if you are using wifi, and drop in a [pigate.conf](files/boot/pigate.conf) with your Callsign and password. You can use any custom direwolf config file here, enabling many different hardware configurations!
+2. Insert SD card into a computer and load your [wpa_supplicant.conf] into boot if you are using wifi, and drop in a [direwolf.conf](files/boot/direwolf.conf) with your callsign and password. You can use any custom direwolf config file here, enabling many different hardware configurations!
 3. Insert into a raspberry pi with RTL-SDR plugged into USB, and power up! If everything was configured correctly, in about 5 minutes you should see it pop up on [aprs.fi].
 
 Once the pi is running, it should be available on your network with hostname `aprs-pigate` and accessible via SSH `pi@aprs-pigate` using the default raspberry password. It is a good idea to change this once logged in, or disable passwords altogether and use SSH keys, which you can do by modifying the `user-data` file accessible on the boot partition after flashing.
@@ -16,7 +16,7 @@ The startup script creates a `screen` and executes the startup script [`rtl-dw-s
 Logs are also written to `/home/pi/aprslogs/aprs.log`. You can view these with commands like `less` or `tail`, and generally may be easier to work with than the direwolf screen.
 
 ### Customizing the Start Script
-If you are setting up a digipeater, you can disable the Software Defined Radio by creating an empty file `DISABLE_SDR` and placing it into the boot folder of your SD card along with `pigate.conf`. See the [`rtl-dw-start.sh`] startup script for more details.
+If you are setting up a digipeater, you can disable the Software Defined Radio by creating an empty file `DISABLE_SDR` and placing it into the boot folder of your SD card along with `direwolf.conf`. See the [`rtl-dw-start.sh`] startup script for more details.
 
 ## Contributing & Development
 This project uses the following dependencies:
@@ -32,3 +32,4 @@ Run `make build` to start building your first image.
 [`packer-build-arm-image`]: https://github.com/solo-io/packer-builder-arm-image/
 [rtl-sdr]: https://www.rtl-sdr.com/
 [`rtl-dw-start.sh`]: files/home/pi/rtl-dw-start.sh
+[wpa_supplicant.conf]: https://www.raspberrypi.org/documentation/configuration/wireless/headless.md
diff --git a/files/boot/pigate.conf b/files/boot/direwolf.conf
similarity index 100%
rename from files/boot/pigate.conf
rename to files/boot/direwolf.conf
diff --git a/files/boot/user-data.yaml b/files/boot/user-data
similarity index 85%
rename from files/boot/user-data.yaml
rename to files/boot/user-data
index f1a89cc..f407905 100644
--- a/files/boot/user-data.yaml
+++ b/files/boot/user-data
@@ -34,5 +34,5 @@ timezone: "America/Chicago"
 final_message: "The system is finally up, after $UPTIME seconds"
 
 runcmd:
-  - "cp /boot/pigate.conf /home/pi/pigate.conf"
-  - "chown pi:pi /home/pi/pigate.conf"
+  - "cp /boot/direwolf.conf /home/pi/pigate-direwolf.conf"
+  - "chown pi:pi /home/pi/pigate-direwolf.conf"
diff --git a/files/home/pi/rtl-dw-start.sh b/files/home/pi/rtl-dw-start.sh
index 06fd52d..a00000c 100644
--- a/files/home/pi/rtl-dw-start.sh
+++ b/files/home/pi/rtl-dw-start.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if test -f "/boot/DISABLE_SDR"; then
-    direwolf -c /home/pi/pigate.conf -L /home/pi/aprslogs/aprs.log
+    direwolf -c /home/pi/pigate-direwolf.conf -L /home/pi/aprslogs/aprs.log
 else
-    rtl_fm -f 144.39M | direwolf -c /home/pi/pigate.conf -L /home/pi/aprslogs/aprs.log
+    rtl_fm -f 144.39M | direwolf -c /home/pi/pigate-direwolf.conf -L /home/pi/aprslogs/aprs.log
 fi
diff --git a/packer/aprs-pigate.json b/packer/aprs-pigate.json
index 42baa08..0f4169d 100644
--- a/packer/aprs-pigate.json
+++ b/packer/aprs-pigate.json
@@ -60,7 +60,7 @@
         },
         {
             "type": "file",
-            "source": "files/boot/user-data.yaml",
+            "source": "files/boot/user-data",
             "destination": "/boot/user-data"
         },
         {