Some cleaning and renaming.
Some clean and fix as item slot is handled differently