diff --git a/bin/linspector b/bin/linspector
index ca474de..d915f7a 100755
--- a/bin/linspector
+++ b/bin/linspector
@@ -34,8 +34,8 @@ from multiprocessing import Pool
 
 from linspector.config.parser import FullConfigParser
 from linspector.core.interface import LinspectorInterface
-from linspector.core.job import Job
-from linspector.core.scheduler import Scheduler
+from linspector.core.job import LinspectorJob
+from linspector.core.scheduler import LinspectorScheduler
 from linspector.frontends.lish import LishFrontend
 from linspector.tasks.task import TaskExecutor
 
@@ -122,7 +122,7 @@ def main():
         logger.error(msg)
         exit()
 
-    scheduler = Scheduler({"apscheduler.threadpool.core_threads": args.corethreads,
+    scheduler = LinspectorScheduler({"apscheduler.threadpool.core_threads": args.corethreads,
                            "apscheduler.threadpool.max_threads": args.threads})
     scheduler.start()
     TaskExecutor.Instance()
@@ -154,11 +154,11 @@ def main():
 
                         time_delta += float(args.delay)
                         new_start_date = start_date + datetime.timedelta(seconds=time_delta)
-                        job = Job(service,
-                                  host,
-                                  hostgroup.get_members(),
-                                  core,
-                                  hostgroup)
+                        job = LinspectorJob(service,
+                                            host,
+                                            hostgroup.get_members(),
+                                            core,
+                                            hostgroup)
                         scheduler_job = period.createJob(scheduler, job, handle_job, start_date=new_start_date)
                         if scheduler_job is not None:
                             job.set_job(scheduler_job)