renamings and bug fixes