Fixing names take 2