renamings and improvements