Re #18; fix #names and specs