Some after-import tweaks

Split from initial commit:
* variable names changes,
* more generic pages,
* (new) typofix.

Change-Id: I136c395670f14b804eaa0d3f94767bc5dcb7baed
Merge "Some after-import tweaks"