diff --git a/Makefile b/Makefile
index 847e8bb..db2bd0f 100644
--- a/Makefile
+++ b/Makefile
@@ -19,21 +19,21 @@ lint:
 	golangci-lint run
 	sh -c 'test -z "$$(gofmt -l .)"'
 
-debug: ./$(FN)d
+debug: ./$(FN)
 	DEBUG=1 GOTRACEBACK=all ./$(FN)d
 
 debugger:
-	cd cmd/$(FN)d && dlv debug main.go
+	cd cmd/$(FN) && dlv debug main.go
 
 run: ./$(FN)d
 	./$(FN)d
 
 clean:
-	-rm -f ./$(FN)d debug.log
+	-rm -f ./$(FN) debug.log
 
 docker:
 	docker build --progress plain .
 
-./$(FN)d: cmd/$(FN)d/main.go internal/*/*.go assets/*/*
-	cd ./cmd/$(FN)d && \
-		go build -o ../../$(FN)d $(GOFLAGS) .
+./$(FN): cmd/$(FN)/main.go internal/*/*.go assets/*/*
+	cd ./cmd/$(FN) && \
+		go build -o ../../$(FN) $(GOFLAGS) .
diff --git a/cmd/httpd/main.go b/cmd/directory/main.go
similarity index 100%
rename from cmd/httpd/main.go
rename to cmd/directory/main.go
diff --git a/internal/database/database.go b/internal/database/database.go
index 5065f81..4c01726 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -78,7 +78,7 @@ func (d *Database) Get() (*gorm.DB, error) {
 }
 
 func (d *Database) Connect() error {
-	dsn := d.params.Config.DatabaseDSN
+	dsn := d.params.Config.DBDSN
 	if dsn == "" {
 		err := errors.New("database DSN is empty")
 		d.log.Error().Err(err).Msg("failed to get database DSN from config")
@@ -123,4 +123,3 @@ func (d *Database) Ping() error {
 	d.log.Info().Msg("successfully pinged the database")
 	return nil
 }
-