Moved some image file name code into Executive.cs