rename. minor improvements