Further rename fixes