Rename SimpleList to List and SimpleMap to Map