cleanup bugs from rename