add suffixes and change naming scheme