as part of the move, also make the extension names consistent Change-Id: I779b948a3ba63c95bb1c4650bc76c7259f0828fe