Replace 'currentWhen' with 'current-when' to prevent the depreciation warnings in 1.8.0 and above