Renamings and better exports