Clean up ...
Hack to avoid case sensitivity...