Updated Item names
Additional name changes
Merge branch 'master' into CivTest
Added Jar