Preparations and renamings
branch in progress