Some more housekeeping!
- Even more cleanup on remaining name placeholders

Signed-off-by: ThinkIV <thinkivme@gmail.com>