Add benchmark target and rename fields