Basic: Temporary fix for name matching problem.

Signed-off-by: Jakub Novak <jakub.novak@gmail.com>
We just do need tests, that's it.