We could replace all exterior shots of DS1 with the more iconic DS2, and have that he the one and only Death Star. Then Eclispe for ROTJ.
I agree SKB should just be a base. Perhaps we could edit the exterior shots to make it a plain planet (the scale is really off, fuel oslicator is seeable from space about the size of Texas but on ground it’s the size of a football stadium).