Some name fixing