diff --git a/cmd/mothd/state.go b/cmd/mothd/state.go
index 5c6f9c8..b0e4726 100644
--- a/cmd/mothd/state.go
+++ b/cmd/mothd/state.go
@@ -451,5 +451,5 @@ func (ds *DevelState) TeamName(teamID string) (string, error) {
 	if name, err := ds.StateProvider.TeamName(teamID); err == nil {
 		return name, nil
 	}
-	return fmt.Sprintf("Devel Server Team %s", teamID), nil
+	return fmt.Sprintf("«devel:%s»", teamID), nil
 }
diff --git a/cmd/mothd/state_test.go b/cmd/mothd/state_test.go
index 8abc09a..1d88953 100644
--- a/cmd/mothd/state_test.go
+++ b/cmd/mothd/state_test.go
@@ -271,7 +271,7 @@ func TestDevelState(t *testing.T) {
 	ds := NewDevelState(s)
 	if n, err := ds.TeamName("boog"); err != nil {
 		t.Error("Devel State returned error on team name lookup")
-	} else if n != "Devel Server Team boog" {
+	} else if n != "«devel:boog»" {
 		t.Error("Wrong team name", n)
 	}