Renamed parameter from remove_suffix to suffix