Refactor, name designs according to iteration 'i'