Changed some class names in order to keep to Java Good Practices