Fixes to Item naming, arg injection