Attempt to make keys more consistent as reported in #26