Additional Naming updates

Additional Naming updates