diff --git a/app/main.py b/app/main.py
index 436bb93..8ec950c 100644
--- a/app/main.py
+++ b/app/main.py
@@ -3,8 +3,8 @@ from pydantic import BaseModel
 from typing import Set, List, Optional, Dict
 from random import randint
 
-from models.solve_request import SolveRequest
-from models.solve_response import SolveResponse
+from models.solver_run import SolverRun
+from models.solution import Solution
 from models.form import Form
 
 app = FastAPI()
@@ -29,11 +29,11 @@ async def ready():
   return 'OK'  # just means we're on air
 
 @app.post('/solve/')
-async def solve(solve_request: SolveRequest):
-  response = SolveResponse(
+async def solve(solver_run: SolverRun):
+  response = Solution(
     response_id=randint(100,5000),
     forms=[Form(
-      items=[item.id for item in solve_request.items]
+      items=[item.id for item in solver_run.items]
     )]
   )
   return response
diff --git a/app/models/solve_response.py b/app/models/solution.py
similarity index 80%
rename from app/models/solve_response.py
rename to app/models/solution.py
index dcdc3d7..1681439 100644
--- a/app/models/solve_response.py
+++ b/app/models/solution.py
@@ -3,6 +3,6 @@ from typing import List, Optional
 
 from models.form import Form
 
-class SolveResponse(BaseModel):
+class Solution(BaseModel):
   response_id: int
   forms: List[Form]
diff --git a/app/models/solve_request.py b/app/models/solver_run.py
similarity index 94%
rename from app/models/solve_request.py
rename to app/models/solver_run.py
index df213bb..43b223c 100644
--- a/app/models/solve_request.py
+++ b/app/models/solver_run.py
@@ -7,7 +7,7 @@ from models.irt_model import IRTModel
 from models.objective_function import ObjectiveFunction
 from models.advanced_options import AdvancedOptions
 
-class SolveRequest(BaseModel):
+class SolverRun(BaseModel):
   token: str
   items: List[Item]
   constraints: List[Constraint]