more rename; fix collision in basement