Merge "Rename module dist files"