Audited code for name change. Finishes #13