Help me please oh naming gurus *update in comments*