Changed the names to be more generic.