Fix naming nits per review