Rename classes & other fixes