associate better names with restored functions

some renaming, and simplify sysimg code a bit