Factor out namer, make names more compact, add tests