renamed two classes to more clearly identify their dependencies