Your comments

Why not have the option to allow admins to add custom fields.  Keep the main fields, but allow the option for two custom fields.  We also use Title's to identify the process for that user story. 
For example;
Title: Fitness Test - Infrastructure
Title: Fitness Test - Calculation
Title: Fitness Test - Processing