Further playbook cleanup and names streamlining