Fixed naming inconsistency of 'current_'.