Refined naming scheme and output.