Module Rename and Extension Cleanup