ami: more naming naming