Made Water/Lava names more literal to blockstates

Will be doing this for a lot of these probably so we can easier
categorize everything for a future blockstate update.