Fix case sensitivity issues with following