We have many "image" packages, so these vars easily conflict/shadow imports. Let's rename them (and in some cases use a const) to prevent that. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>