Update RemappingHelper.cs