diff --git a/sam/types/channel_perms.go b/sam/types/channel.perms.go
similarity index 100%
rename from sam/types/channel_perms.go
rename to sam/types/channel.perms.go
diff --git a/sam/types/organisation_perms.go b/sam/types/organisation.perms.go
similarity index 100%
rename from sam/types/organisation_perms.go
rename to sam/types/organisation.perms.go
diff --git a/sam/types/permissions/main.go b/sam/types/permissions/main.go
deleted file mode 100644
index eac2e7926..000000000
--- a/sam/types/permissions/main.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"strings"
-
-	"github.com/crusttech/crust/internal/rbac"
-)
-
-func main() {
-	var (
-		pkg    = flag.String("package", "main", "Package name")
-		input  = flag.String("input", "", "Input .json filename")
-		output = flag.String("output", "", "Output .go filename")
-		fname  = flag.String("function", "func Permissions() []rbac.OperationGroup", "Default function declaration")
-	)
-	flag.Parse()
-
-	export := func(s string) string {
-		s = strings.Replace(s, "true,", "true,\n", -1)
-		s = strings.Replace(s, "false,", "false,\n", -1)
-		s = strings.Replace(s, "{", "{\n", -1)
-		s = strings.Replace(s, "}", ",\n}", -1)
-		s = strings.Replace(s, "\", ", "\",\n", -1)
-
-		var w bytes.Buffer
-
-		fmt.Fprintln(&w, "package", *pkg)
-		fmt.Fprintln(&w)
-		fmt.Fprintln(&w, "import \"github.com/crusttech/crust/internal/rbac\"")
-		fmt.Fprintln(&w)
-		fmt.Fprintln(&w, "/* File is generated from", *input, "& main.go */")
-		fmt.Fprintln(&w)
-		fmt.Fprintln(&w, *fname, "{")
-		fmt.Fprintln(&w, "\treturn", s)
-		fmt.Fprintln(&w, "}")
-
-		return w.String()
-	}
-
-	var result []rbac.OperationGroup
-	f, err := os.Open(*input)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if err := json.NewDecoder(f).Decode(&result); err != nil {
-		log.Fatal(err)
-	}
-	source := export(fmt.Sprintf("%#v", result))
-	if err := ioutil.WriteFile(*output, []byte(source), 0644); err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println(*output)
-}
diff --git a/sam/types/team_perms.go b/sam/types/team.perms.go
similarity index 100%
rename from sam/types/team_perms.go
rename to sam/types/team.perms.go