Renamed the template classes so that it's more obvious.