Namefixes and stuff