Squashed 'src/System/' changes from 8f71e89..4b09049

4b09049 fix renaming bugs

git-subtree-dir: src/System
git-subtree-split: 4b09049bcdc4119d773f873e7d94029d9ca2be57
Merge commit 'faec6696222f3f575041eeae54a9f5bc16777121'