Rename a couple of internal properties so they make a bit more sense (hopefully)

Signed-off-by: Blake Skinner <bskinner@mit.edu>