SSP-867 Fix changeset for proper naming and to properly update virtual table