Refactor suffixes