A few more small name updates and deletions, still needs more work