Release 3.0 Progress

Consistent in-place naming conventions