Rename js syntax supertype and reduce constructors