Save template, and rename API  endpoints