Rename image2d class and tweak method sig