Some namefixes