Give core and ui plugin/activator classes better names