Use class name and not enclosing class for screenshot name

Change-Id: I8e9e0487f4354ee0523b5d3c0c016a002c395107