Core/Scripts: rename files, remove whitespace and some other small changes after recent pull requests