It should be wired as a sub panel, separate neutral and ground - no matter what the planned solar or generator hookup. The fundamentals stay the same. Throw away the green screw, put in a ground bus bar, move the grounds to that.
Separate question, in the third picture, what ties the neutrals...