Revert "support for new naming scheme" to have the branch based on
what's in the production repository

This reverts commit 00f7eeeda799e26b0a5c8eb70b3eb60f55f56ab8.
Revert "Pre and post fit shapes and uncertainties" to go back
to the central master branch

This reverts commit 2caf3b06d028ea85aeb3d4d97eb5933c652d846c.