Yes, the clip and the tool are the same for both guns.
It is next to impossible to do this job and not crack your handguard without this tool.
