Merge test
Renamed the input classes for consistency.