item naming improvements

condensed some items and fixed a few for proper naming conventions.