3.0.7 finish rename, bug fixes