A bunch of renames

Signed-off-by: John McCutchan <john@johnmccutchan.com>