Fixed file names due to https://www.drupal.org/node/2302893