Commit 28f05585a31ffbd723b6e4356df44d3085709644

Edward Thomson 2018-10-21T09:20:10

ci: reorganize naming for consistency