rename fixes