Some small renamings, refs #448