Fix bugs with name capitalisation