I might be wrong here but in the finale, Cara Dune says her "gun is jammed. Is it just me or have they never referred to blasters as guns. later in the episode Moff Gideon even says “drop the blaster”. I personally found it distracting. Maybe you could trim some of these hallway blaster scenes?
Han Solo and Luke refer to a blaster pistol and a turret, respectively as “gun” in Return of the Jedi.