Update Naming Convention as per LP 144

Update Naming Convention as per LP 144