Fixed Sync Issue / Renamed Items

-Got the sync issue under control
-The Items names were the old names in all the factories i fixed that.
-Minor fixes to code