Simplify name parsing

This uses sed in a one-step process vice extraneous cat/grep/awk