Put an end to that "Bob went to Bob's bedroom" troglodyte-speak.
Reorganize code.  Use mixins for proper and plural actors.