Bug fixes and some more housekeeping

- Fixed Bug #7199
- Fixed Bug #7265
- Even more cleanup on remaining name placeholders