Update LVA naming convention