rename and module additions