Cleanup template loaders

I see you've simply moved this, but I'd cleanup "template source loader" -> "template loader" to use consistent terminology.