analyzator names refactor