rename stuff & concerns separation step 1