Perhaps @meisl has some ideas regarding the naming. I have fixed the other issues and pushed them. This one requires more eyes and ideas...