History rename (#234): identifiers
History rename: files. Closes #234.
History rename: files. Closes #234.
Fixes #244.
Merge branch 'master' into spire