We were at WDW in Jan of this year and they were using the individual toiletries and they were H2O products.
There has been some discussion on the boards that they are doing away with those products and replacing with the wall mounted kind. Not sure if that has happened yet or if it will. I do believe it will happen in CA or it may have already happened due to new laws in that state.