More name cleanups

Replace overseen old names with new ones.
Indentation fixes
NeulandTox: Remove unused struct members
window: Remove unused function