Renamings

See #423.