Rename, Delete - Mass Update

Signed-off-by: Vineel Kumar Reddy Kovvuri <vineelkumarr@nvidia.com>