GPII-127: Clean up use of markup template, improve naming