various helpful renamings