more rename fixes