updated class
renamed key to suffix
use prefix and suffix