New naming scheme, scaler now downscales properly