Minor changes: naming, reducers on all stages