Simplify package name, simplify image support.