diff --git a/Featurecreep.md b/Featurecreep.md
index f7eab36c..517c08cb 100644
--- a/Featurecreep.md
+++ b/Featurecreep.md
@@ -184,7 +184,7 @@ Sorry for some of them being in German, I'll tranlate them at some point.
 * [x] Have extra functions for logging to call so it is possible to call `log.Info` instead of `log.Log.Info`  
 * [x] `GetUserByID` and the likes should return pointers
 * [x] `ListTask` should be just `Task`
-* [ ] Move `teams_{namespace|list}_*` to `{namespace|list}_teams_*` for better consistency
+* [x] Move `teams_{namespace|list}_*` to `{namespace|list}_teams_*` for better consistency
 
 ### Linters
 
diff --git a/pkg/models/team_list.go b/pkg/models/list_team.go
similarity index 100%
rename from pkg/models/team_list.go
rename to pkg/models/list_team.go
diff --git a/pkg/models/team_list_rights.go b/pkg/models/list_team_rights.go
similarity index 100%
rename from pkg/models/team_list_rights.go
rename to pkg/models/list_team_rights.go
diff --git a/pkg/models/team_list_test.go b/pkg/models/list_team_test.go
similarity index 100%
rename from pkg/models/team_list_test.go
rename to pkg/models/list_team_test.go
diff --git a/pkg/models/team_namespace.go b/pkg/models/namespace_team.go
similarity index 100%
rename from pkg/models/team_namespace.go
rename to pkg/models/namespace_team.go
diff --git a/pkg/models/team_namespace_rights.go b/pkg/models/namespace_team_rights.go
similarity index 100%
rename from pkg/models/team_namespace_rights.go
rename to pkg/models/namespace_team_rights.go
diff --git a/pkg/models/team_namespace_rights_test.go b/pkg/models/namespace_team_rights_test.go
similarity index 100%
rename from pkg/models/team_namespace_rights_test.go
rename to pkg/models/namespace_team_rights_test.go
diff --git a/pkg/models/team_namespace_test.go b/pkg/models/namespace_team_test.go
similarity index 100%
rename from pkg/models/team_namespace_test.go
rename to pkg/models/namespace_team_test.go