Renamed some constructors & data types