some renames
add new template