more rename and cleanup