fixing shadowing/import/package/locking/etcetcetc errors