Renamed bugfix not picking up the correct renamed