analyzer: fix imports and function names