b=966636 rename resampling copy variables consistently and test remaining input better r=padenot

--HG--
extra : rebase_source : 7d2c34865aeb21d67207e0d4e7b2fd3e8956d54c