A series of clarifying symbol renames

Signed-off-by: Casey Dahlin <casey.dahlin@gmail.com>