Aren't they changing the dungeons in 2.0?

I wonder if they just threw in Chimera for a cool final boss fight for us playing before 2.0. I highly doubt they had a underground desert battle in mind for Chimera....