Constructor names

And line 123 unfortunately. And 158.