Replace all LIST, SET and MAP with List, Set, Map