Fixes #5164 - fix rpm builds

Also, makes the naming of scripts consistent with the rest of scripts