Change template file names and its references

change "-" with "_"