Minor renaming, contributes to #2.