Rework names, and add tests