Fix group prefixes