Change in ds-jenkins-stg[master]: Renamed some files to make things look better here