Renamed all files to use - instead of _