small fixes in names