Changed class names to be more adequate