These are a recurring cause of confusion, so rename them to
hopefully be clearer.
Signed-off-by: NGreg Price <price@mit.edu>
Signed-off-by: N"Theodore Ts'o" <tytso@mit.edu>