I've found that Fiji brand water bottles serve my purposes very well, they are square and come in 500ml and 1Lsizes. They are clear PETE, and the original labels peel off cleanly for relabeling.