fixes and renamings