Changed SameTypeList to List

Change-Id: If7bb39509cdadc366d6207ec9f8fddc07032096b