Allow virtual templates (just a block name)
Tidy up variable case to match standard use