Use suffixes (8/48)

Use suffixes