Rename i to id

Resolves #14