Fix issues from rename