Simplify names

https://www.drupal.org/node/2350623