Small renamings in master code