MaintainExtensions no longer exists
rename files
fixed opportunity test
Merge pull request #431 from shackbarth/tweaks

issue #20416: fixed filenames