Rename file that was missed.
Use Term math for Unit multiplication/division/exponentiation (and some other cleanup).