Code

naming: avoid unintentional double-meanings (part 1)