Renamed deprecated class as there's one with same name in other input an...

...d this cause error in eclipse #388