[minor] Better log
Reporting errors on incorrect import usage
[minor] Method rename - more consistency