fixes in names