Improve template naming and content to be a bit more logical and easier to overwrite