more rename cleanup