Fixed a pointer mismatch issue between the hsc files and the .*pp files.
Fixed constructor names to be less repetitive.