Fixing names, cos I dun goof