Improved the names of the duo template blocks.