Renamed file and class to avoid conflicts