some more rename bug fixed