Finish proper rename. oops!