Made report generation dynamic
Small name change for clarity