SSP-867 changed naming convention to match