Restored shorter template paths