Standardize the method for replacing suffixes
Merge pull request #818 from he7d3r/develop

Standardize the method for replacing suffixes