Imporvement to instance naming.