Update paths to match our conventions