Clean-up 2 or 3

Renamed some scripts to match
Cleaned up the shooting scripts