Minor bug fix related to rename