Remove accidental trailing slash
Merge branch 'centralise-module-filename' again