Renamings and added size.