Changed some class names to more clearly names.