Fixed rename bugs.