[TASK] Respect case sensitive 1/2
[TASK] Respect case sensitive 2/2