Make some names more consistent and clarify units in the comments