Renamed files to conform to siriproxy rules