Added more samples. Renamed some elements.