name/path fixes