Use Sample for targets
Update generic_target_generator to return correct sample_run_prefix