diff --git "a/mock/foresp\303\270rsel-om-deling-av-cv-api/foresp\303\270rselOmDelingAvCvMock.ts" b/mock/foresporsel-om-deling-av-cv-api/mock.ts
similarity index 100%
rename from "mock/foresp\303\270rsel-om-deling-av-cv-api/foresp\303\270rselOmDelingAvCvMock.ts"
rename to mock/foresporsel-om-deling-av-cv-api/mock.ts
diff --git a/mock/kandidat-api/kandidatApiMock.ts b/mock/kandidat-api/mock.ts
similarity index 100%
rename from mock/kandidat-api/kandidatApiMock.ts
rename to mock/kandidat-api/mock.ts
diff --git "a/mock/kandidatsok-proxy/kandidats\303\270kMock.ts" b/mock/kandidatsok-proxy/mock.ts
similarity index 100%
rename from "mock/kandidatsok-proxy/kandidats\303\270kMock.ts"
rename to mock/kandidatsok-proxy/mock.ts
diff --git a/mock/innloggetBrukerMock.ts b/mock/meg/mock.ts
similarity index 83%
rename from mock/innloggetBrukerMock.ts
rename to mock/meg/mock.ts
index ea0ab1d3..ff96292b 100644
--- a/mock/innloggetBrukerMock.ts
+++ b/mock/meg/mock.ts
@@ -1,5 +1,5 @@
 import { rest } from 'msw';
-import { api } from '../src/felles/api';
+import { api } from '../../src/felles/api';
 
 export const innloggetBrukerMock = [
     rest.get(api.innloggetBruker, (_, res, ctx) =>
diff --git a/mock/modiaContextHolderMock.ts b/mock/modiacontextholder/mock.ts
similarity index 100%
rename from mock/modiaContextHolderMock.ts
rename to mock/modiacontextholder/mock.ts
diff --git a/mock/setup.ts b/mock/setup.ts
index cea565e4..912f345a 100644
--- a/mock/setup.ts
+++ b/mock/setup.ts
@@ -1,12 +1,12 @@
 import { setupWorker } from 'msw';
-import { modiaContextHolderMock } from './modiaContextHolderMock';
-import { innloggetBrukerMock } from './innloggetBrukerMock';
-import { kandidatApiMock } from './kandidat-api/kandidatApiMock';
-import { kandidatsøkMock } from './kandidatsok-proxy/kandidatsøkMock';
-import { forespørselOmDelingAvCvMock } from './forespørsel-om-deling-av-cv-api/forespørselOmDelingAvCvMock';
-import { statistikkApiMock } from './statistikk-api/statistikkApiMock';
-import { stillingApiMock } from './stilling-api/stillingApiMock';
-import { stillingssøkMock } from './stillingssok-proxy/stillingssøkMock';
+import { modiaContextHolderMock } from './modiacontextholder/mock';
+import { innloggetBrukerMock } from './meg/mock';
+import { kandidatApiMock } from './kandidat-api/mock';
+import { kandidatsøkMock } from './kandidatsok-proxy/mock';
+import { forespørselOmDelingAvCvMock } from './foresporsel-om-deling-av-cv-api/mock';
+import { statistikkApiMock } from './statistikk-api/mock';
+import { stillingApiMock } from './stilling-api/mock';
+import { stillingssøkMock } from './stillingssok-proxy/mock';
 
 const handlers = [
     ...innloggetBrukerMock,
diff --git a/mock/statistikk-api/statistikkApiMock.ts b/mock/statistikk-api/mock.ts
similarity index 100%
rename from mock/statistikk-api/statistikkApiMock.ts
rename to mock/statistikk-api/mock.ts
diff --git a/mock/stilling-api/stillingApiMock.ts b/mock/stilling-api/mock.ts
similarity index 100%
rename from mock/stilling-api/stillingApiMock.ts
rename to mock/stilling-api/mock.ts
diff --git "a/mock/stillingssok-proxy/stillingss\303\270kMock.ts" b/mock/stillingssok-proxy/mock.ts
similarity index 100%
rename from "mock/stillingssok-proxy/stillingss\303\270kMock.ts"
rename to mock/stillingssok-proxy/mock.ts