Name refactor completed 2.0.