Updates on the raises in the code; rename some data siles.