Changed to correct suffixes.