Renamed files and classes to more adequate description