Batch tokens (#755)

helper/namespace/namespace.go

@@ -104,7 +104,18 @@ func Canonicalize(nsPath string) string {
 func SplitIDFromString(input string) (string, string) {
 	prefix := ""
 	slashIdx := strings.LastIndex(input, "/")
-	if slashIdx > 0 {
+
+	switch {
+	case strings.HasPrefix(input, "b."):
+		prefix = "b."
+		input = input[2:]
+
+	case strings.HasPrefix(input, "s."):
+		prefix = "s."
+		input = input[2:]
+
+	case slashIdx > 0:
+		// Leases will never have a b./s. to start
 		if slashIdx == len(input)-1 {
 			return input, ""
 		}