Add a TODO
Rename variables to aim:* for consistency

This breaks backwards compatibility, so we may not want this.