diff --git a/go.mod b/go.mod
index 8f1c18d..b9ee3df 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module codeberg.org/andcscott/OpenWeatherMap-gRPC-API
+module codeberg.org/andcscott/OpenWeather-gRPC-API
 
 go 1.19
 
diff --git a/proto/location.proto b/proto/location.proto
index 9bcaf52..fe4f3e5 100644
--- a/proto/location.proto
+++ b/proto/location.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package weather;
 
-option go_package = "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto";
+option go_package = "codeberg.org/andcscott/OpenWeather-gRPC-API/proto";
 
 // Sub-message for Coordinates
 message Coordinates {
diff --git a/proto/service.proto b/proto/service.proto
index c98d655..052fc37 100644
--- a/proto/service.proto
+++ b/proto/service.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package weather;
 
-option go_package = "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto";
+option go_package = "codeberg.org/andcscott/OpenWeather-gRPC-API/proto";
 
 import "weather.proto";
 import "location.proto";
diff --git a/proto/weather.proto b/proto/weather.proto
index f5cc69e..6e4482b 100644
--- a/proto/weather.proto
+++ b/proto/weather.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package weather;
 
-option go_package = "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto";
+option go_package = "codeberg.org/andcscott/OpenWeather-gRPC-API/proto";
 
 import "location.proto";
 
diff --git a/server/current.go b/server/current.go
index 750a8b0..7c194eb 100644
--- a/server/current.go
+++ b/server/current.go
@@ -7,7 +7,7 @@ import (
 	"log"
 	"net/http"
 
-	pb "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto"
+	pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
 )
 
 // Receives a gRPC request for the current forecast
diff --git a/server/extended.go b/server/extended.go
index c649a47..ce77156 100644
--- a/server/extended.go
+++ b/server/extended.go
@@ -7,7 +7,7 @@ import (
 	"log"
 	"net/http"
 
-	pb "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto"
+	pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
diff --git a/server/location.go b/server/location.go
index 6835832..1e4cf2b 100644
--- a/server/location.go
+++ b/server/location.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"net/http"
 
-	pb "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto"
+	pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
diff --git a/server/main.go b/server/main.go
index 6096f78..2f8fae8 100644
--- a/server/main.go
+++ b/server/main.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strconv"
 
-	pb "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto"
+	pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
 	"github.com/joho/godotenv"
 	"google.golang.org/grpc"
 )
diff --git a/test-client/current.go b/test-client/current.go
index e743e49..8884d98 100644
--- a/test-client/current.go
+++ b/test-client/current.go
@@ -4,17 +4,17 @@ import (
 	"context"
 	"log"
 
-	pb "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto"
+	pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
 )
 
 func doCurrent(c pb.WeatherServiceClient) {
 
 	res, err := c.Current(context.Background(), &pb.RequestCurrent{
-		LocationType: pb.LocationType_LOCATION_TYPE_ZIP_CODE,
+		LocationType: pb.LocationType_LOCATION_TYPE_CITY,
 		Units:        pb.Units_UNITS_METRIC,
 		Location: &pb.OneOfLocation{
-			LocationId: &pb.OneOfLocation_ZipCode{
-				ZipCode: "97330",
+			LocationId: &pb.OneOfLocation_City{
+				City: "Corvallis",
 			},
 		},
 	})
diff --git a/test-client/extended.go b/test-client/extended.go
index fc43a2e..812b142 100644
--- a/test-client/extended.go
+++ b/test-client/extended.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log"
 
-	pb "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto"
+	pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
 )
 
 func doFiveDay(c pb.WeatherServiceClient) {
diff --git a/test-client/location.go b/test-client/location.go
index ec4e50b..43b8faf 100644
--- a/test-client/location.go
+++ b/test-client/location.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log"
 
-	pb "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto"
+	pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
 )
 
 func doLocation(c pb.WeatherServiceClient) {
diff --git a/test-client/main.go b/test-client/main.go
index 96cba25..60503f2 100644
--- a/test-client/main.go
+++ b/test-client/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	pb "codeberg.org/andcscott/OpenWeatherMap-gRPC-API/proto"
+	pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )