Renamed file to match class name.
More robustness work.