Renamed files to use the paymentServer_XXX.. convention