I think it depends where you're from, whether "rickshaw" implies a motor or not: usage in Pakistan and India differs. Of course, originally none of them had motors, as reflected in the etymology of the Japanese "jin-riku-sha" = human-power-vehicle. That said, I've never used any of these things, and may well be confused.