Changed some class names to make it more clear