Added item name (class name) normalization
oops