diff --git a/internal/handler/auth_test.go b/internal/handler/auth_test.go
index 257dd1a..36b4b2d 100644
--- a/internal/handler/auth_test.go
+++ b/internal/handler/auth_test.go
@@ -113,12 +113,12 @@ func TestAuthHandler_CompleteOnboarding_Success(t *testing.T) {
 		assert.Equal(t, http.StatusSeeOther, w.Code)
 		assert.Equal(t, "/app/dashboard", w.Header().Get("Location"))
 
-		// Space "John's Space" with a default account should now exist
+		// Default space with a default account should now exist
 		spaceRepo := repository.NewSpaceRepository(dbi.DB)
 		spaces, err := spaceRepo.ByUserID(user.ID)
 		assert.NoError(t, err)
 		assert.Len(t, spaces, 1)
-		assert.Equal(t, "John's Space", spaces[0].Name)
+		assert.Equal(t, service.DefaultSpaceName, spaces[0].Name)
 
 		accountRepo := repository.NewAccountRepository(dbi.DB)
 		accounts, err := accountRepo.BySpaceID(spaces[0].ID)
diff --git a/internal/service/auth.go b/internal/service/auth.go
index a5d6ff6..0a7b2ee 100644
--- a/internal/service/auth.go
+++ b/internal/service/auth.go
@@ -358,8 +358,7 @@ func (s *AuthService) CompleteOnboarding(userID, name string) error {
 	}
 
 	if len(existing) == 0 {
-		spaceName := name + "'s Space"
-		space, err := s.spaceService.CreateSpace(spaceName, userID)
+		space, err := s.spaceService.CreateSpace(DefaultSpaceName, userID)
 		if err != nil {
 			return fmt.Errorf("failed to create onboarding space: %w", err)
 		}
diff --git a/internal/service/auth_test.go b/internal/service/auth_test.go
index d34fdd6..044c745 100644
--- a/internal/service/auth_test.go
+++ b/internal/service/auth_test.go
@@ -189,12 +189,12 @@ func TestAuthService_CompleteOnboarding(t *testing.T) {
 		require.NotNil(t, updated.Name)
 		assert.Equal(t, "New Name", *updated.Name)
 
-		// A space named "<name>'s Space" was provisioned
+		// A space named DefaultSpaceName was provisioned
 		spaceRepo := repository.NewSpaceRepository(dbi.DB)
 		spaces, err := spaceRepo.ByUserID(user.ID)
 		require.NoError(t, err)
 		require.Len(t, spaces, 1)
-		assert.Equal(t, "New Name's Space", spaces[0].Name)
+		assert.Equal(t, DefaultSpaceName, spaces[0].Name)
 
 		// With a default account inside it
 		accountRepo := repository.NewAccountRepository(dbi.DB)
diff --git a/internal/service/space.go b/internal/service/space.go
index ee36a11..423629d 100644
--- a/internal/service/space.go
+++ b/internal/service/space.go
@@ -9,6 +9,8 @@ import (
 	"github.com/google/uuid"
 )
 
+const DefaultSpaceName = "My Space"
+
 type SpaceService struct {
 	spaceRepo repository.SpaceRepository
 }