Reverting back to original names

While the new names might be slightly more descriptive, the heritage of
the old names means something.