Items cleanup and name fixes