Placate Rubocop - no underscores in .rb filenames
Fix Rubocop -> RuboCop again (0.18 -> 0.26 resolves locally)