Rename fixes