Drop Skin from names of templates

Far too confusing. I wonder if this is why skin code ended up inside
templates

Change-Id: I0e79c5899aa1bc5adc8e567b1d098e5534d75491