Minor fixes to name and stuff.