Some userful renamings done