SSP-2305 Fix imports to match prevailing style