Fix name bug with extension
Revert "Fix name bug with extension"

This reverts commit a3d0ecf5f1dfabcec82245b057c4c87f8d85333e.