Various renamings per Josef's suggestions