Set some more verbose names. Fixes #23