Fix naming, part 1
Fix naming, part 2