Rename variables

This is a follow up on #62.