diff --git a/shunt_tags b/shunt_tags
index f2448d8..d852963 100755
--- a/shunt_tags
+++ b/shunt_tags
@@ -85,6 +85,11 @@ function fixup($input) {
 	$tmp = preg_replace('~([^p])v2\b~i', '\1 [v2] ', $tmp); // They could be part of the episode number - pull them out - BUT don't pull out "PV2" 
 	$tmp = preg_replace('~([^p])v3\b~i', '\1 [v3] ', $tmp);
 	$tmp = preg_replace('~([^p])v4\b~i', '\1 [v4] ', $tmp);
+
+	if (strpos($tmp, '[a-s]') !== false) {
+		// This sub group puts a team member username in the filename 
+		$tmp = preg_replace('~\\b(rs2|pball)\\b~', '[\1]', $tmp);
+	}
 	
 	// Remove nesting
 	$drop_nested_tags = function($tmp) {