Adapt naming, tighten some cuts for a better start for the tuning campaign and overhaul the tupling after discussion with @tevans. Necessary for BW division studies. CC @rangel who wrote the line