Updated a few namesÄ